Fix mis-merge.

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 25665325dd34933d3d56f46ba6a94b9a156164fa..0fc3382479d180865f668df6c2f8b4a671db3649 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -237,7 +237,7 @@ FilmViewer::get ()
        try {
                _butler->rethrow ();
        } catch (DecodeError& e) {
        try {
                _butler->rethrow ();
        } catch (DecodeError& e) {

-               error_dialog (_video_view->get(), e.what());
+               error_dialog (_panel, e.what());

        }
 
        display_player_video ();
        }
 
        display_player_video ();