Fix disappearing frames while seeking in some cases.
authorCarl Hetherington <cth@carlh.net>
Tue, 10 Oct 2017 21:47:12 +0000 (22:47 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 10 Oct 2017 21:47:12 +0000 (22:47 +0100)
src/wx/film_viewer.cc
test/wscript

index 9493a55..60025a7 100644 (file)
@@ -290,7 +290,7 @@ FilmViewer::get ()
                return;
        }
 
-       if ((time() - video.second) > one_video_frame()) {
+       if (_playing && (time() - video.second) > one_video_frame()) {
                /* Too late; just drop this frame before we try to get its image (which will be the time-consuming
                   part if this frame is J2K).
                */
index ecbc32f..646ba00 100644 (file)
@@ -97,6 +97,7 @@ def build(bld):
                  ssa_subtitle_test.cc
                  stream_test.cc
                  subtitle_reel_number_test.cc
+                 subtitle_seek_test.cc
                  test.cc
                  threed_test.cc
                  time_calculation_test.cc