fix #89401: delete first measure removes timesig from parts

musescore · Dec 3, 2015 · eeee71e · eeee71e
1 parent 77e980d
commit eeee71e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -2061,22 +2061,22 @@ void Score::cmdDeleteSelectedMeasures()
             Measure* is = score->tick2measure(startTick);
             Measure* ie = score->tick2measure(endTick);
 
-            undoRemoveMeasures(is, ie);
+            score->undoRemoveMeasures(is, ie);
 
             // adjust views
-            Measure* focusOn = is->prevMeasure() ? is->prevMeasure() : firstMeasure();
-            foreach(MuseScoreView* v, score->viewer)
+            Measure* focusOn = is->prevMeasure() ? is->prevMeasure() : score->firstMeasure();
+            for (MuseScoreView* v : score->viewer)
                   v->adjustCanvasPosition(focusOn, false);
 
             if (createEndBar) {
                   Measure* lastMeasure = score->lastMeasure();
                   if (lastMeasure && lastMeasure->endBarLineType() == BarLineType::NORMAL)
-                        undoChangeEndBarLineType(lastMeasure, BarLineType::END);
+                        score->undoChangeEndBarLineType(lastMeasure, BarLineType::END);
                   }
 
             // insert correct timesig after deletion
             Measure* mBeforeSel = is->prevMeasure();
-            Measure* mAfterSel  = mBeforeSel ? mBeforeSel->nextMeasure() : firstMeasure();
+            Measure* mAfterSel  = mBeforeSel ? mBeforeSel->nextMeasure() : score->firstMeasure();
             if (mAfterSel && lastDeletedSig) {
                   bool changed = true;
                   if (mBeforeSel) {