Skip to content

Commit 76dba2b

Browse files
authored
Merge pull request #26773 from rettinghaus/xml/fix-arpeggio-color
[MusicXML] read non-arpeggiate color and avoid double checks
2 parents 67e4163 + ca4218e commit 76dba2b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/importexport/musicxml/internal/musicxml/import/importmusicxmlpass2.cpp

+2-4
Original file line numberDiff line numberDiff line change
@@ -8503,10 +8503,7 @@ void MusicXmlParserNotations::arpeggio()
85038503
if (m_arpeggioNo == 0) {
85048504
m_arpeggioNo = 1;
85058505
}
8506-
Color color = Color::fromString(m_e.attribute("color"));
8507-
if (color.isValid()) {
8508-
m_arpeggioColor = color;
8509-
}
8506+
m_arpeggioColor = Color::fromString(m_e.attribute("color"));
85108507
m_e.skipCurrentElement(); // skip but don't log
85118508
}
85128509

@@ -8993,6 +8990,7 @@ void MusicXmlParserNotations::parse()
89938990
} else if (m_e.name() == "glissando") {
89948991
glissandoSlide();
89958992
} else if (m_e.name() == "non-arpeggiate") {
8993+
m_arpeggioColor = Color::fromString(m_e.attribute("color"));
89968994
m_arpeggioType = u"non-arpeggiate";
89978995
m_e.skipCurrentElement(); // skip but don't log
89988996
} else if (m_e.name() == "ornaments") {

0 commit comments

Comments
 (0)