Merge pull request #2264 from MarcSabatella/84296-musicxml-chords

fix #84296: bad import of certain chord symbols
musescore · Oct 27, 2015 · fe8f704 · fe8f704
2 parents 5f7a57a + 737b4d4
commit fe8f704
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/libmscore/chordlist.cpp b/libmscore/chordlist.cpp
@@ -1182,8 +1182,10 @@ QString ParsedChord::fromXml(const QString& rawKind, const QString& rawKindText,
             _quality = "augmented";
       else if (kind == "half-diminished") {
             _quality = "half-diminished";
-            extension = 7;
-            extend = true;
+            if (symbols) {
+                  extension = 7;
+                  extend = true;
+                  }
             }
       else if (kind == "diminished-seventh") {
             _quality = "diminished";
@@ -1304,7 +1306,7 @@ QString ParsedChord::fromXml(const QString& rawKind, const QString& rawKindText,
             _extension = QString("%1").arg(extension);
 
       // validate kindText
-      if (kindText != "" && kind != "none") {
+      if (kindText != "" && kind != "none" && kind != "other") {
             ParsedChord validate;
             validate.parse(kindText, cl, false);
             // kindText should parse to produce same kind, no degrees