From 76457a0e09f5040dee0c21dcf414eefc5faf7abd Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 18 Apr 2017 10:29:43 +0100
Subject: [PATCH] Don't return 'no video' from get_video() until the player has
 finished and we have exhausted our store.

---
 src/lib/butler.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/butler.cc b/src/lib/butler.cc
index ca58bc13e..de982a0fe 100644
--- a/src/lib/butler.cc
+++ b/src/lib/butler.cc
@@ -112,7 +112,7 @@ Butler::get_video ()
 		_arrived.wait (lm);
 	}
 
-	if (_finished) {
+	if (_video.empty() && _finished) {
 		return make_pair (shared_ptr<PlayerVideo>(), DCPTime());
 	}
 
-- 
2.30.2