fix #40216: Accidental on trill are not displayed anymore

musescore · Nov 29, 2014 · be027cd · be027cd
1 parent c3d48c6
commit be027cd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/libmscore/accidental.h b/libmscore/accidental.h
@@ -121,7 +121,7 @@ class Accidental : public Element {
       virtual void startEdit(MuseScoreView*, const QPointF&) { setGenerated(false); }
 
       SymId symbol() const;
-      Note* note() const                  { return (Note*)parent(); }
+      Note* note() const       { return (parent() && parent()->type() == Element::Type::NOTE) ? (Note*)parent() : 0; }
 
       bool hasBracket() const             { return _hasBracket;     }
       void setHasBracket(bool val)        { _hasBracket = val;      }