fix #11915: 1.X score with E#'s displaying as F#'s

musescore · Jun 19, 2013 · 7c7ca30 · 7c7ca30
1 parent dbe62fa
commit 7c7ca30
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libmscore/note.cpp b/libmscore/note.cpp
@@ -1396,8 +1396,8 @@ void Note::layout10(AccidentalState* as)
                   acci = _accidental->accidentalType();
                   if (acci == Accidental::ACC_SHARP || acci == Accidental::ACC_FLAT) {
                         // TODO - what about double flat and double sharp?
-                        // TODO - does this need to be key-aware?
-                        int ntpc = pitch2tpc(_pitch, KEY_C, acci == Accidental::ACC_SHARP ? PREFER_SHARPS : PREFER_FLATS);
+                        KeySigEvent key = (staff() && chord()) ? staff()->key(chord()->tick()) : KeySigEvent();
+                        int ntpc = pitch2tpc(_pitch, key.accidentalType(), acci == Accidental::ACC_SHARP ? PREFER_SHARPS : PREFER_FLATS);
                         if (ntpc != _tpc) {
                               qDebug("note has wrong tpc: %d, expected %d", _tpc, ntpc);
 //                              setColor(QColor(255, 0, 0));