# HG changeset patch
# User Chris Cannam
# Date 1404335050 -3600
# Node ID fd95308b5d3fa6593ce007698c71b5d74d38d05e
# Parent  09026c8753016e662cf99c52b9c8163db4d5d41b# Parent  24f18a7dd26d0cb175adfa807b606ace84795327
Merge from tonioni branch

diff -r 09026c875301 -r fd95308b5d3f view/Overview.cpp
--- a/view/Overview.cpp	Wed Jul 02 17:30:09 2014 +0100
+++ b/view/Overview.cpp	Wed Jul 02 22:04:10 2014 +0100
@@ -288,7 +288,12 @@
 #ifdef DEBUG_OVERVIEW
         cerr << "Overview::mouseMoveEvent: x " << e->x() << " and click x " << m_clickPos.x() << " -> frame " << newCentreFrame << " -> rf " << rf << endl;
 #endif
-	emit centreFrameChanged(rf, true, PlaybackScrollContinuous);
+        if (m_followPlay == PlaybackScrollContinuous ||
+            m_followPlay == PlaybackScrollPageWithCentre) {
+            emit centreFrameChanged(rf, true, PlaybackScrollContinuous);
+        } else {
+            emit centreFrameChanged(rf, true, PlaybackIgnore);
+        }            
     }
 }