Fix glitchy timeline slider if its update timer goes off while a seek is happening.

2 files changed, 5 insertions, 1 deletions

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index 92103637c..ec6d4ff4c 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -170,7 +170,7 @@ Controls::stopped ()
 void
 Controls::update_position ()
 {
-	if (!_slider_being_moved) {
+	if (!_slider_being_moved && !_viewer->pending_idle_get()) {
 		update_position_label ();
 		update_position_slider ();
 	}
diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h
index c54ff6eb4..f7c31468b 100644
--- a/src/wx/film_viewer.h
+++ b/src/wx/film_viewer.h
@@ -134,6 +134,10 @@ public:
 	}
 	void finished ();
 
+	bool pending_idle_get () const {
+		return _idle_get;
+	}
+
 	boost::signals2::signal<void (boost::weak_ptr<PlayerVideo>)> ImageChanged;
 	boost::signals2::signal<void (dcpomatic::DCPTime)> Started;
 	boost::signals2::signal<void (dcpomatic::DCPTime)> Stopped;