Merge pull request #3911 from mattmcclinch/275369-keysig

fix #275369: Key signatures are lost 2.X->3.0
musescore · Sep 1, 2018 · 7f19224 · 7f19224
2 parents 9526b7b + af0a6c7
commit 7f19224
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -4016,7 +4016,8 @@ void Measure::addSystemHeader(bool isFirstSystem)
                         bool disable = true;
                         for (int staffIdx = 0; staffIdx < score()->nstaves(); ++staffIdx) {
                               Element* e = kSegment->element(staffIdx * VOICES);
-                              if (e && (!e->generated() || toKeySig(e)->key() != Key::C)) {
+                              Key key = score()->staff(staffIdx)->key(tick());
+                              if ((e && !e->generated()) || (key != keyIdx.key())) {
                                     disable = false;
                                     break;
                                     }