projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Improve butler error reporting during export.
[dcpomatic.git]
/
src
/
lib
/
butler.cc
diff --git
a/src/lib/butler.cc
b/src/lib/butler.cc
index 20180330e5f68d2a048402328ccc32d7da64fd7b..595d98809be9d13b729d4c37e7d41667d551cfff 100644
(file)
--- a/
src/lib/butler.cc
+++ b/
src/lib/butler.cc
@@
-238,7
+238,13
@@
Butler::get_video (bool blocking, Error* e)
if (_video.empty()) {
if (e) {
- *e = NONE;
+ if (_died) {
+ *e = DIED;
+ } else if (_finished) {
+ *e = FINISHED;
+ } else {
+ *e = NONE;
+ }
}
return make_pair(shared_ptr<PlayerVideo>(), DCPTime());
}