X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;h=b53f39b451ab3aca2cede112d120e283ad135d75;hb=57d76e4bdea59aa833f5fb75697bcfbebc18cc3a;hp=d6b6bc2b72aaba15126950ebdf4244c7e051d260;hpb=9f125fddff88bf62d36381f9d3f09e5240b033d5;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d6b6bc2b7..b53f39b45 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -388,6 +388,7 @@ public:
 		left_panel->SetSizerAndFit(left_sizer);
 
 		_controls = new StandardControls(_right_panel, _film_viewer, true);
+		_controls->set_film(_film_viewer.film());
 		auto job_manager_view = new JobManagerView(_right_panel, false);
 
 		auto right_sizer = new wxBoxSizer (wxVERTICAL);
@@ -1820,8 +1821,10 @@ private:
 
 	void close_splash ()
 	{
-		_splash->Destroy();
-		_splash = nullptr;
+		if (_splash) {
+			_splash->Destroy();
+			_splash = nullptr;
+		}
 	}
 
 	void config_failed_to_load (Config::LoadFailure what)
@@ -1908,7 +1911,7 @@ private:
 	}
 
 	DOMFrame* _frame = nullptr;
-	wxSplashScreen* _splash;
+	wxSplashScreen* _splash = nullptr;
 	shared_ptr<wxTimer> _timer;
 	string _film_to_load;
 	string _film_to_create;