# HG changeset patch
# User Chris Cannam
# Date 1558707249 -3600
# Node ID 0ecfaa463c1b11cbbe2070de5dbaf73bcd9c0bc5
# Parent  f31ccc5f3fb8b8696681425e273bd5ef168a76f2# Parent  66bf1abfefc11c6d6096131f901412a76dd6a51e
Merge

diff -r 66bf1abfefc1 -r 0ecfaa463c1b view/ViewManager.cpp
--- 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);