From: Carl Hetherington <cth@carlh.net>
Date: Tue, 10 Oct 2017 21:47:12 +0000 (+0100)
Subject: Fix disappearing frames while seeking in some cases.
X-Git-Tag: v2.11.27~22
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=75d96ae6da6c605c495e257601f246b1249bcb3f

Fix disappearing frames while seeking in some cases.
---

diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 9493a55c9..60025a7de 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -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).
 		*/
diff --git a/test/wscript b/test/wscript
index ecbc32fab..646ba00fa 100644
--- a/test/wscript
+++ b/test/wscript
@@ -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