diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-26 00:06:01 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-03-26 00:06:01 +0000 |
| commit | ee88ec8603130b5ea3b5679cfd8eafe45eeaaa67 (patch) | |
| tree | 32d277d58791b398c04060ec793ede4861ed8a43 | |
| parent | 5ca9bcec5557a43f3a566996a239f5ed129c5c99 (diff) | |
Unset _awaiting on a regular seek. This fixes bad behaviour in the sequence:
- some player_change; _awaiting is set
- regular seek occurs (perhaps to a time much earlier than _awaiting)
- another player_change occurs; player_change handler wrongly seeks back to _awaiting
May help with #1505.
| -rw-r--r-- | src/lib/butler.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/butler.cc b/src/lib/butler.cc index cf39945b6..e15cb9d3f 100644 --- a/src/lib/butler.cc +++ b/src/lib/butler.cc @@ -243,6 +243,7 @@ void Butler::seek (DCPTime position, bool accurate) { boost::mutex::scoped_lock lm (_mutex); + _awaiting = optional<DCPTime>(); seek_unlocked (position, accurate); } |
