summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2017-10-10 22:47:12 +0100
committerCarl Hetherington <cth@carlh.net>2017-10-10 22:47:12 +0100
commit75d96ae6da6c605c495e257601f246b1249bcb3f (patch)
tree09ced122822b62a0039e5e9aa410f2d1e402ec30
parentf7ccae9cf646b53f57fffd9637cffae1cd26bb6c (diff)
Fix disappearing frames while seeking in some cases.
-rw-r--r--src/wx/film_viewer.cc2
-rw-r--r--test/wscript1
2 files changed, 2 insertions, 1 deletions
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