Mercurial > hg > svgui

changeset 1466:0ecfaa463c1b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 24 May 2019 15:14:09 +0100
parents f31ccc5f3fb8 (diff) 66bf1abfefc1 (current diff)
children f9110e5afca1
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/view/ViewManager.cpp	Fri May 24 14:29:19 2019 +0100
+++ b/view/ViewManager.cpp	Fri May 24 15:14:09 2019 +0100
@@ -211,7 +211,7 @@
 #ifdef DEBUG_VIEW_MANAGER
     cerr << "ViewManager::alignPlaybackFrameToReference(" << frame << "): playback model is " << m_playbackModel << endl;
 #endif
-    if (!m_playbackModel) {
+    if (!m_playbackModel || !m_alignMode) {
         return frame;
     } else {
         sv_frame_t f = m_playbackModel->alignToReference(frame);
@@ -228,7 +228,7 @@
 #ifdef DEBUG_VIEW_MANAGER
     cerr << "ViewManager::alignReferenceToPlaybackFrame(" << frame << "): playback model is " << m_playbackModel << endl;
 #endif
-    if (!m_playbackModel) {
+    if (!m_playbackModel || !m_alignMode) {
         return frame;
     } else {
         sv_frame_t f = m_playbackModel->alignFromReference(frame);