X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ffilm_editor.cc;h=a017175f522106d4663f1b98d37087d9e2304d19;hb=15e9cb7324f1b331acde37d30590ba42c032eff2;hp=1e06bf4a9674f899ff8dfbab55243f836e47a18b;hpb=927d4d2f5bd1d77024369fc1f7de32ca085a3ee4;p=dcpomatic.git

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 1e06bf4a9..a017175f5 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -22,14 +22,14 @@
  *  @brief FilmEditor class.
  */
 
-#include "lib/film.h"
-#include "lib/job_manager.h"
-#include "lib/content.h"
-#include "lib/dcp_content.h"
 #include "wx_util.h"
 #include "film_editor.h"
 #include "dcp_panel.h"
 #include "content_panel.h"
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include "lib/content.h"
+#include "lib/dcp_content.h"
 #include <wx/wx.h>
 #include <wx/notebook.h>
 #include <boost/foreach.hpp>
@@ -39,9 +39,10 @@ using std::cout;
 using std::string;
 using std::list;
 using boost::shared_ptr;
+using boost::weak_ptr;
 using boost::optional;
 
-FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
+FilmEditor::FilmEditor (wxWindow* parent, weak_ptr<FilmViewer> viewer)
 	: wxPanel (parent)
 {
 	wxBoxSizer* s = new wxBoxSizer (wxVERTICAL);
@@ -50,7 +51,7 @@ FilmEditor::FilmEditor (wxWindow* parent, FilmViewer* viewer)
 	s->Add (_main_notebook, 1);
 
 	_content_panel = new ContentPanel (_main_notebook, _film, viewer);
-	_main_notebook->AddPage (_content_panel->panel (), _("Content"), true);
+	_main_notebook->AddPage (_content_panel->window(), _("Content"), true);
 	_dcp_panel = new DCPPanel (_main_notebook, _film);
 	_main_notebook->AddPage (_dcp_panel->panel (), _("DCP"), false);
 
@@ -124,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 ());
 	}
 }