projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename some classes.
[dcpomatic.git]
/
src
/
lib
/
butler.cc
diff --git
a/src/lib/butler.cc
b/src/lib/butler.cc
index 89095613d1eb3db09a8639e208c37f38c33ac947..f7e7222725455c71cb8c78590c8c4fb428dcba72 100644
(file)
--- a/
src/lib/butler.cc
+++ b/
src/lib/butler.cc
@@
-90,6
+90,7
@@
try
/* Do any seek that has been requested */
if (_pending_seek_position) {
/* Do any seek that has been requested */
if (_pending_seek_position) {
+ _finished = false;
_player->seek (*_pending_seek_position, _pending_seek_accurate);
_pending_seek_position = optional<DCPTime> ();
}
_player->seek (*_pending_seek_position, _pending_seek_accurate);
_pending_seek_position = optional<DCPTime> ();
}
@@
-102,8
+103,7
@@
try
lm.unlock ();
bool const r = _player->pass ();
lm.lock ();
lm.unlock ();
bool const r = _player->pass ();
lm.lock ();
- /* We must check _pending_seek_position again here as it may have been set while lm was unlocked */
- if (r && !_pending_seek_position) {
+ if (r) {
_finished = true;
_arrived.notify_all ();
break;
_finished = true;
_arrived.notify_all ();
break;