Mercurial > hg > svgui

diff view/View.cpp @ 860:4a5d144bd5d0 tonioni

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Tue, 09 Sep 2014 16:36:21 +0100
parents ee36642b9b59
children e0f08e108064
line wrap: on
line diff
--- a/view/View.cpp	Tue Sep 02 16:23:48 2014 +0100
+++ b/view/View.cpp	Tue Sep 09 16:36:21 2014 +0100
@@ -1312,7 +1312,7 @@
 int
 View::alignFromReference(int f) const
 {
-    if (!m_manager->getAlignMode()) return f;
+    if (!m_manager || !m_manager->getAlignMode()) return f;
     Model *aligningModel = getAligningModel();
     if (!aligningModel) return f;
     return aligningModel->alignFromReference(f);
@@ -1330,6 +1330,7 @@
 int
 View::getAlignedPlaybackFrame() const
 {
+    if (!m_manager) return 0;
     int pf = m_manager->getPlaybackFrame();
     if (!m_manager->getAlignMode()) return pf;