Merge pull request #4945 from songchaow/fix-287515-crash

fix #284012 and #287515: Crash by editing/selecting entire score when another hidden staff contains beamed notes
musescore · Apr 22, 2019 · 6c58cef · 6c58cef
2 parents 222dfa4 + 88bc651
commit 6c58cef
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -3663,8 +3663,13 @@ void Score::layoutSystemElements(System* system, LayoutContext& lc)
 
       for (Segment* s : sl) {
             for (Element* e : s->elist()) {
-                  if (!e || !e->isChordRest() || !score()->staff(e->staffIdx())->show())
+                  if (!e || !e->isChordRest() || !score()->staff(e->staffIdx())->show()) {
+                        // the beam and its system may still be referenced when selecting all,
+                        // even if the staff is invisible. The old system is invalid and does cause problems in #284012
+                        if (e && e->isChordRest() && !score()->staff(e->staffIdx())->show() && toChordRest(e)->beam())
+                              toChordRest(e)->beam()->setParent(nullptr);
                         continue;
+                        }
                   ChordRest* cr = toChordRest(e);
 
                   // layout beam