From: Carl Hetherington <cth@carlh.net>
Date: Tue, 26 Mar 2019 00:06:01 +0000 (+0000)
Subject: Unset _awaiting on a regular seek.  This fixes bad behaviour in the sequence:
X-Git-Tag: v2.13.137~3
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ee88ec8603130b5ea3b5679cfd8eafe45eeaaa67

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.
---

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);
 }