projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6a4e591
)
Don't return 'no video' from get_video() until the player has finished and we have...
author
Carl Hetherington
<cth@carlh.net>
Tue, 18 Apr 2017 09:29:43 +0000
(10:29 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 19 Apr 2017 22:04:32 +0000
(23:04 +0100)
src/lib/butler.cc
patch
|
blob
|
history
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());
}