diff view/ViewManager.cpp @ 808:40c6c9344ff6 warnfix_no_size_t

Merge from branch tony_integration
author Chris Cannam
date Wed, 18 Jun 2014 08:40:46 +0100
parents 4c8ca536b54f c58569bd952e
children 09026c875301
line wrap: on
line diff
--- a/view/ViewManager.cpp	Tue Jun 17 15:55:27 2014 +0100
+++ b/view/ViewManager.cpp	Wed Jun 18 08:40:46 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;
     }