diff options
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_viewer.cc | 2 | ||||
| -rw-r--r-- | src/wx/video_view.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index fb02f0a0f..2fda1c93e 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -805,7 +805,7 @@ FilmViewer::dropped () const int FilmViewer::errored () const { - return _video_view->errored (); + return _video_view->errored() + (_butler ? _butler->errors().size() : 0); } diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc index c271cb65e..91bd0d6af 100644 --- a/src/wx/video_view.cc +++ b/src/wx/video_view.cc @@ -90,6 +90,8 @@ VideoView::get_next_frame (bool non_blocking) _player_video.first->eyes() != Eyes::BOTH ); + // XXX: this is too early to check this; error() is only set up when image/make_image is called + // on the _player_video, which might not have happened yet (though it could have, with the prepare() stuff) if (_player_video.first && _player_video.first->error()) { ++_errored; } |