Merge pull request #6183 from njvdberg/issue-302573-crash-undo-instru…

…ments Fix #302573 - Crash undoing add instruments
musescore · Jun 9, 2020 · 13793f9 · 13793f9
2 parents 7bbcb88 + 954aed8
commit 13793f9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -5307,8 +5307,9 @@ static bool needViewportMove(Score* cs, ScoreView* cv)
       mEnd = mEnd ? mEnd->nextMeasureMM() : nullptr;
 
       const bool isExcerpt = !cs->isMaster();
-      const int startStaff = (isExcerpt || state.startStaff() < 0) ? 0 : state.startStaff();
-      const int endStaff = (isExcerpt || state.endStaff() < 0) ? (cs->nstaves() - 1) : state.endStaff();
+      const bool csStaves = (isExcerpt || (state.endStaff() < 0) || (state.endStaff() >= cs->nstaves()));
+      const int startStaff = csStaves ? 0 : state.startStaff();
+      const int endStaff = csStaves ? (cs->nstaves() - 1) : state.endStaff();
 
       for (Measure* m = mStart; m && m != mEnd; m = m->nextMeasureMM()) {
             for (int st = startStaff; st <= endStaff; ++st) {