Merge pull request #4137 from blackears/278232-crash-deleting-staff

fix #278232 Crash when deleting staff while open in PianoRoll
musescore · Nov 14, 2018 · c9fe878 · c9fe878
2 parents 2264301 + b1fc556
commit c9fe878
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/mscore/pianolevels.cpp b/mscore/pianolevels.cpp
@@ -546,7 +546,9 @@ void PianoLevels::updateNotes()
             return;
             }
 
-      int staffIdx   = _staff->idx();
+      int staffIdx = _staff->idx();
+      if (staffIdx == -1)
+            return;
 
       SegmentType st = SegmentType::ChordRest;
       for (Segment* s = _staff->score()->firstSegment(st); s; s = s->next1(st)) {

diff --git a/mscore/pianoview.cpp b/mscore/pianoview.cpp
@@ -1104,7 +1104,9 @@ void PianoView::updateNotes()
       scene()->clear();
       clearNoteData();
 
-      int staffIdx   = _staff->idx();
+      int staffIdx = _staff->idx();
+      if (staffIdx == -1)
+            return;
 
       SegmentType st = SegmentType::ChordRest;
       for (Segment* s = _staff->score()->firstSegment(st); s; s = s->next1(st)) {