Manually merged #6184 to master

musescore · Aug 7, 2020 · 38d2e8c · 38d2e8c
1 parent 68bc6f3
commit 38d2e8c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/libmscore/note.cpp b/libmscore/note.cpp
@@ -946,7 +946,15 @@ 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);
+                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;