X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=2ec174260154158bc02c871ef6427cf21cc8200f;hb=6d686ea45f5cd01a0d11f92a903ac77779ad8562;hp=d7493ad6346a9f92e289620de918e99a76a3c511;hpb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;p=dcpomatic.git diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index d7493ad63..2ec174260 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -32,11 +32,11 @@ #include "lib/dcp_content.h" #include "lib/film.h" #include "lib/job_manager.h" -#include "lib/warnings.h" -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS using std::list; @@ -135,19 +135,12 @@ FilmEditor::set_film (shared_ptr film) _dcp_panel->set_film (_film); if (!_film) { - FileChanged (""); return; } _film->Change.connect (bind(&FilmEditor::film_change, this, _1, _2)); _film->ContentChange.connect (bind(&FilmEditor::film_content_change, this, _1, _3)); - if (_film->directory()) { - FileChanged (_film->directory().get()); - } else { - FileChanged (""); - } - if (!_film->content().empty()) { _content_panel->set_selection (_film->content().front()); }