Avoid crashes if MeasureRepeat element is not first ChordRest

musescore · Aug 3, 2020 · d6e2d39 · d6e2d39
1 parent 21d29e4
commit d6e2d39
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -2829,16 +2829,13 @@ MeasureRepeat* Measure::containsMeasureRepeat(int staffIdx) const
 {
     int strack   = staffIdx * VOICES;
     int etrack   = (staffIdx + 1) * VOICES;
-    Segment* s   = first(SegmentType::ChordRest);
 
-    if (s == 0) {
-        return nullptr;
-    }
-
-    for (int track = strack; track < etrack; ++track) {
-        Element* e = s->element(track);
-        if (e && e->isMeasureRepeat()) {
-            return toMeasureRepeat(e);
+    for (Segment* s = first(SegmentType::ChordRest); s && s != last(); s = s->next(SegmentType::ChordRest)) {
+        for (int track = strack; track < etrack; ++track) {
+            Element* e = s->element(track);
+            if (e && e->isMeasureRepeat()) {
+                return toMeasureRepeat(e);
+            }
         }
     }
     return nullptr;