# HG changeset patch
# User Chris Cannam
# Date 1193327112 0
# Node ID 973a0272b7125d8762a3ce067e61c6acfc672fcb
# Parent  984c1975f1ff373de578abdb351f2ee2e859c080
* Add Align button to main window; use it

diff -r 984c1975f1ff -r 973a0272b712 view/View.cpp
--- a/view/View.cpp	Thu Oct 25 14:32:23 2007 +0000
+++ b/view/View.cpp	Thu Oct 25 15:45:12 2007 +0000
@@ -1127,6 +1127,7 @@
 size_t
 View::alignFromReference(size_t f) const
 {
+    if (!m_manager->getAlignMode()) return f;
     Model *aligningModel = getAligningModel();
     if (!aligningModel) return f;
     return aligningModel->alignFromReference(f);
@@ -1135,6 +1136,7 @@
 size_t
 View::alignToReference(size_t f) const
 {
+    if (!m_manager->getAlignMode()) return f;
     Model *aligningModel = getAligningModel();
     if (!aligningModel) return f;
     return aligningModel->alignToReference(f);
@@ -1143,10 +1145,10 @@
 int
 View::getAlignedPlaybackFrame() const
 {
+    int pf = m_manager->getPlaybackFrame();
+    if (!m_manager->getAlignMode()) return pf;
+
     Model *aligningModel = getAligningModel();
-
-    int pf = m_manager->getPlaybackFrame();
-
     if (!aligningModel) return pf;
 
     Model *pm = m_manager->getPlaybackModel();