Mercurial > hg > svgui

diff view/View.cpp @ 803:5d2966b7c201 tony_integration

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, 17 Jun 2014 12:55:10 +0100
parents fe59d97750ba
children 3a52b458fcd5 4c8ca536b54f
line wrap: on
line diff
--- a/view/View.cpp	Fri May 09 17:15:50 2014 +0100
+++ b/view/View.cpp	Tue Jun 17 12:55:10 2014 +0100
@@ -1473,8 +1473,9 @@
 
                 //!!!
                 if (wfm ||
-                    (wfm = dynamic_cast<RangeSummarisableTimeValueModel *>
-                     (model->getSourceModel()))) {
+                    (model && 
+                     (wfm = dynamic_cast<RangeSummarisableTimeValueModel *>
+                      (model->getSourceModel())))) {
                     completion = wfm->getAlignmentCompletion();
 //                    SVDEBUG << "View::checkProgress: Alignment completion = " << completion << endl;
                     if (completion < 100) {