diff options
| author | Carl Hetherington <cth@carlh.net> | 2020-04-23 20:48:11 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-04-23 20:48:11 +0200 |
| commit | 572eef26de36d3a9a29e5ed550e64b4f0d2ec735 (patch) | |
| tree | 9b457b9c9c3fa3785b97026a4a8484a80e61cca0 /src | |
| parent | 990f879d9af6300068af44c431b1a8e158e7f7a0 (diff) | |
Don't clobber the current _player_video when the butler returns AGAIN. Fixes some seek-related glitches.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/video_view.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/wx/video_view.cc b/src/wx/video_view.cc index b9c45631e..b0e16737c 100644 --- a/src/wx/video_view.cc +++ b/src/wx/video_view.cc @@ -73,10 +73,11 @@ VideoView::get_next_frame (bool non_blocking) do { Butler::Error e; - _player_video = butler->get_video (!non_blocking, &e); - if (!_player_video.first && e == Butler::AGAIN) { + pair<shared_ptr<PlayerVideo>, dcpomatic::DCPTime> pv = butler->get_video (!non_blocking, &e); + if (!pv.first && e == Butler::AGAIN) { return false; } + _player_video = pv; } while ( _player_video.first && _three_d && |