Mercurial > hg > svgui

diff view/ViewManager.cpp @ 804:5c4a405a70fc tony_integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "tonioni"
author Chris Cannam
date Tue, 17 Jun 2014 12:55:18 +0100
parents c58569bd952e
children 40c6c9344ff6
line wrap: on
line diff
--- a/view/ViewManager.cpp	Tue Jun 17 12:55:10 2014 +0100
+++ b/view/ViewManager.cpp	Tue Jun 17 12:55:18 2014 +0100
@@ -554,7 +554,7 @@
         if (v) emit viewCentreFrameChanged(v, f);
     }
 
-    if (!dynamic_cast<Overview *>(v) || (mode != PlaybackIgnore)) {
+    if (!dynamic_cast<Overview *>(v) || (mode == PlaybackScrollContinuous)) {
         if (m_mainModelSampleRate != 0) {
             emit activity(tr("Scroll to %1")
                           .arg(RealTime::frame2RealTime
@@ -562,7 +562,7 @@
         }
     }
 
-    if (mode == PlaybackIgnore) {
+    if (mode != PlaybackScrollContinuous) {
         return;
     }