diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-21 01:47:22 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-21 01:50:07 +0100 |
| commit | c5f67166138c3849cc49f1223742343ce4b11b9f (patch) | |
| tree | 6137a1b0cf653b0e3e8677e7e960fcb2e84f9979 /src/wx | |
| parent | c3cccfcf0f3942a55f1c0df5ba623fcfa360533e (diff) | |
Give an error if 2D content is set to 3D (#1565). Also run
3D tests with more parallel jobs to speed them up.
Backported from 11c07c6fd98620c859c7d3dcf6a4bbf6a05e567e in v2.15.x.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 6d050157c..25665325d 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -234,7 +234,11 @@ FilmViewer::get () _player_video.first->eyes() != EYES_BOTH ); - _butler->rethrow (); + try { + _butler->rethrow (); + } catch (DecodeError& e) { + error_dialog (_video_view->get(), e.what()); + } display_player_video (); } |