From 572eef26de36d3a9a29e5ed550e64b4f0d2ec735 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 23 Apr 2020 20:48:11 +0200
Subject: [PATCH] Don't clobber the current _player_video when the butler
 returns AGAIN.  Fixes some seek-related glitches.

---
 src/wx/video_view.cc | 5 +++--
 1 file 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 &&
-- 
2.30.2