Merge pull request #2236 from MarcSabatella/81371

lasconic · lasconic · commit 0bc5ff562a0e · 2015-09-27T18:15:08.000+02:00
fix #81371: crash/hang with frames at end of score
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -2815,7 +2815,7 @@ QList<System*> Score::layoutSystemRow(qreal rowWidth, bool isFirstSystem, bool u
                   if (curMeasure)
                         curMeasure = curMeasure->prev();
                   else
-                        curMeasure = lastMeasure();
+                        curMeasure = last();
                   }
             firstInRow = false;
             }

Original file line number	Diff line number	Diff line change
`@@ -2815,7 +2815,7 @@ QList<System*> Score::layoutSystemRow(qreal rowWidth, bool isFirstSystem, bool u`
`2815`	`2815`	`if (curMeasure)`
`2816`	`2816`	`curMeasure = curMeasure->prev();`
`2817`	`2817`	`else`
`2818`		`- curMeasure = lastMeasure();`
	`2818`	`+ curMeasure = last();`
`2819`	`2819`	`}`
`2820`	`2820`	`firstInRow = false;`
`2821`	`2821`	`}`