From: Carl Hetherington <cth@carlh.net>
Date: Tue, 18 Apr 2017 09:29:43 +0000 (+0100)
Subject: Don't return 'no video' from get_video() until the player has finished and we have... 
X-Git-Tag: v2.11.1~40
X-Git-Url: https://git.carlh.net/gitweb/?a=commitdiff_plain;h=76457a0e09f5040dee0c21dcf414eefc5faf7abd;p=dcpomatic.git

Don't return 'no video' from get_video() until the player has finished and we have exhausted our store.
---

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());
 	}