Add File->Close to main DCP-o-matic (#1180).

[dcpomatic.git] / src / wx / film_editor.cc

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 59b44cd8c0e3ab53949352a6ac312fb672b1ed2c..a017175f522106d4663f1b98d37087d9e2304d19 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -125,18 +125,21 @@ FilmEditor::set_film (shared_ptr<Film> film)
        _content_panel->set_film (_film);
        _dcp_panel->set_film (_film);
 
-       if (_film) {
-               _film->Change.connect (bind (&FilmEditor::film_change, this, _1, _2));
-               _film->ContentChange.connect (bind (&FilmEditor::film_content_change, this, _1, _3));
+       if (!_film) {
+               FileChanged ("");
+               return;
        }
 
-       if (_film && _film->directory()) {
+       _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 ()) {
+       if (!_film->content().empty()) {
                _content_panel->set_selection (_film->content().front ());
        }
 }