Avoid virtual call to set_film() in constructor (#2571).

2 files changed, 2 insertions, 0 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d6b6bc2b7..fc568d737 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);
diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index cbb58e945..81af93b9e 100644
--- a/src/tools/dcpomatic_player.cc
+++ b/src/tools/dcpomatic_player.cc
@@ -254,6 +254,7 @@ public:
 		} else {
 			_controls = new StandardControls (_overall_panel, _viewer, false);
 		}
+		_controls->set_film(_viewer.film());
 		_viewer.set_dcp_decode_reduction(Config::instance()->decode_reduction());
 		_viewer.set_optimise_for_j2k(true);
 		_viewer.PlaybackPermitted.connect(bind(&DOMFrame::playback_permitted, this));