Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x

diff --git a/src/wx/simple_video_view.cc b/src/wx/simple_video_view.cc
index ae13fe1bcde1d10502acb594bd3cd906f29b5d3f..e2ef866c426b1ee6ff5a56a2605a20f448ce06fc 100644 (file)
--- a/src/wx/simple_video_view.cc
+++ b/src/wx/simple_video_view.cc
@@ -158,7 +158,7 @@ SimpleVideoView::timer ()
        }
 
        LOG_DEBUG_PLAYER("%1 -> %2; delay %3", next.seconds(), _viewer->time().seconds(), max((next.seconds() - _viewer->time().seconds()) * 1000, 1.0));
-       _timer.Start (time_until_next_frame().get_value_or(0), wxTIMER_ONE_SHOT);
+       _timer.Start (max(1, time_until_next_frame().get_value_or(0)), wxTIMER_ONE_SHOT);
 
        if (_viewer->butler()) {
                _viewer->butler()->rethrow ();