fix #25616: Rehearsal mark from MuseScore 1.3 causes bad layout and crash

lasconic · lasconic · commit d4ae271a29de · 2014-05-03T11:27:19.000+02:00
diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -736,7 +736,7 @@ bool Element::readProperties(XmlReader& e)
             }
       else if (tag == "tick") {
             int val = e.readInt();
-            if (val >= 0 && type() != SYMBOL  && (type() != GLISSANDO || score()->mscVersion() > 114))   // hack for 1.2
+            if (val >= 0 && type() != SYMBOL  && ((type() != GLISSANDO && type() != FINGERING) || score()->mscVersion() > 114))   // hack for 1.2
                   e.setTick(score()->fileDivision(val));
             }
       else if (tag == "offset")

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ bool Element::readProperties(XmlReader& e)`
`736`	`736`	`}`
`737`	`737`	`else if (tag == "tick") {`
`738`	`738`	`int val = e.readInt();`
`739`		`- if (val >= 0 && type() != SYMBOL && (type() != GLISSANDO \|\| score()->mscVersion() > 114)) // hack for 1.2`
	`739`	`+ if (val >= 0 && type() != SYMBOL && ((type() != GLISSANDO && type() != FINGERING) \|\| score()->mscVersion() > 114)) // hack for 1.2`
`740`	`740`	`e.setTick(score()->fileDivision(val));`
`741`	`741`	`}`
`742`	`742`	`else if (tag == "offset")`