Merge pull request #6184 from MarcSabatella/305293-no-drumset-crash

fix #305293: crash on load of score with missing drumset
musescore · Jun 10, 2020 · 82436a1 · 82436a1
1 parent 01b8867
commit 82436a1
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/libmscore/note.cpp b/libmscore/note.cpp
@@ -879,8 +879,18 @@ SymId Note::noteHead() const
 
       if (_headGroup == NoteHead::Group::HEAD_CUSTOM) {
             if (st) {
-                  if (st->staffTypeForElement(chord())->isDrumStaff())
-                        return st->part()->instrument(chord()->tick())->drumset()->noteHeads(_pitch, ht);
+                  if (st->staffTypeForElement(chord())->isDrumStaff()) {
+                        Fraction t = chord()->tick();
+                        Instrument* inst = st->part()->instrument(t);
+                        Drumset* d = inst->drumset();
+                        if (d) {
+                              return d->noteHeads(_pitch, ht);
+                              }
+                        else {
+                              qDebug("no drumset");
+                              return noteHead(up, NoteHead::Group::HEAD_NORMAL, ht);
+                              }
+                        }
                   }
             else {
                   return _cachedNoteheadSym;