summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-05-21 21:16:33 +0000
committerCarl Hetherington <cth@carlh.net>2019-05-21 21:16:33 +0000
commitec4081efb60790c866e72deeae04a23de81a86f1 (patch)
tree238a4b96bfd22fa8b323b0e9c1e5848883023a8d
parentdf6e1b49ce30beb7a5b6b3e3ce92db0f58891fad (diff)
Fix mis-merge.v2.14.3
-rw-r--r--src/wx/film_viewer.cc2
1 files changed, 1 insertions, 1 deletions
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 ();