Add new hack.

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index ab018c44b9b60d18ee2d3608999fc1eafd194f05..81af93b9ea4b50f7d2fd6db336c183a6ea75ba3d 100644 (file)
--- 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));
@@ -907,14 +908,14 @@ private:
                DCPOMATIC_ASSERT (dcp);
 
                auto job = make_shared<VerifyDCPJob>(dcp->directories());
-               auto progress = make_wx<VerifyDCPProgressDialog>(this, _("DCP-o-matic Player"));
-               bool const completed = progress->run (job);
-               if (!completed) {
-                       return;
-               }
+               VerifyDCPProgressDialog progress(this, _("DCP-o-matic Player"));
+               bool const completed = progress.run(job);
+               progress.Close();
 
-               auto d = make_wx<VerifyDCPDialog>(this, job);
-               d->ShowModal ();
+               if (completed) {
+                       VerifyDCPDialog dialog(this, job);
+                       dialog.ShowModal();
+               }
        }
 
        void tools_check_for_updates ()