summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2019-11-05 23:26:22 +0100
committerCarl Hetherington <cth@carlh.net>2020-01-08 21:56:47 +0100
commit15e82df97cc99b94a7028313dff4eba213ecd84d (patch)
tree70c552621e25e88154d3cc3cda535cdea8abf0e1
parent5eb8b5c3a1566aef638e9d9df03b88d320735092 (diff)
Hack around changes in main branch with respect to suspend/resume.
-rw-r--r--src/wx/film_viewer.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 373e6d717..dc6ed10c4 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -306,7 +306,7 @@ FilmViewer::resume ()
_audio.setStreamTime (_video_position.seconds());
_audio.startStream ();
}
- timer ();
+ _video_view->start ();
}
}
@@ -461,9 +461,6 @@ FilmViewer::seek (DCPTime t, bool accurate)
if (!_playing) {
request_idle_get ();
- } else {
- /* Make sure we get a frame so that _video_position is set up before we resume */
- while (!get(true)) {}
}
resume ();