Add assert.

[dcpomatic.git] / src / wx / film_viewer.cc

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index df66a8ade9120591b28cd086813ebd24988d0d18..17573b4388053fe1ea09539510d8632a7770cffa 100644 (file)
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -286,6 +286,7 @@ FilmViewer::suspend ()
 void
 FilmViewer::resume ()
 {
 void
 FilmViewer::resume ()
 {

+       DCPOMATIC_ASSERT (_suspended > 0);

        --_suspended;
        if (_playing && !_suspended) {
                if (_audio.isStreamOpen()) {
        --_suspended;
        if (_playing && !_suspended) {
                if (_audio.isStreamOpen()) {


@@ -406,16 +407,10 @@ FilmViewer::slow_refresh ()
 bool
 FilmViewer::quick_refresh ()
 {
 bool
 FilmViewer::quick_refresh ()
 {

-       if (!_video_view->_player_video.first) {
-               return false;
-       }
-
-       if (!_video_view->_player_video.first->reset_metadata (_film, _player->video_container_size(), _film->frame_size())) {
-               return false;
+       if (!_video_view || !_film) {
+               return true;

        }
        }

-
-       _video_view->display_player_video ();
-       return true;
+       return _video_view->refresh_metadata (_film, _player->video_container_size(), _film->frame_size());

 }
 
 void
 }
 
 void