From: Carl Hetherington Date: Tue, 21 May 2019 21:16:33 +0000 (+0000) Subject: Fix mis-merge. X-Git-Tag: v2.14.3 X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=ec4081efb60790c866e72deeae04a23de81a86f1;p=dcpomatic.git Fix mis-merge. --- diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 25665325d..0fc338247 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -237,7 +237,7 @@ FilmViewer::get () try { _butler->rethrow (); } catch (DecodeError& e) { - error_dialog (_video_view->get(), e.what()); + error_dialog (_panel, e.what()); } display_player_video ();