projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Don't return 'no video' from get_video() until the player has finished and we have...
[dcpomatic.git]
/
src
/
lib
/
butler.cc
diff --git
a/src/lib/butler.cc
b/src/lib/butler.cc
index ca58bc13ea3ddbfa33ddbc33669e8bad7160b9aa..de982a0feb89a0f65c6aebb042caaab47a763585 100644
(file)
--- 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());
}