Fix #291847 and GH#17428 : Irregular measure not marked when followed…

… by start repeat barline Backport of musescore#17429
Jojo-Schmitz · May 30, 2023 · 4fac3e9 · 4fac3e9
1 parent 1bbee5a
commit 4fac3e9
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/libmscore/barline.cpp b/libmscore/barline.cpp
@@ -701,9 +701,13 @@ void BarLine::draw(QPainter* painter) const
                   break;
             }
       Segment* s = segment();
-      if (s && s->isEndBarLineType() && !score()->printing() && score()->showUnprintable()) {
-            Measure* m = s->measure();
-            if (m->isIrregular() && score()->markIrregularMeasures() && !m->isMMRest()) {
+      if (s && !score()->printing() && score()->showUnprintable()) {
+            Measure* m;
+            if (s->isEndBarLineType())
+                  m = s->measure();
+            else
+                  m = s->measure()->prevMeasure();
+            if (m && m->isIrregular() && score()->markIrregularMeasures() && !m->isMMRest()) {
                   painter->setPen(MScore::layoutBreakColor);
                   QFont f("Edwin");
                   f.setPointSizeF(12 * spatium() * MScore::pixelRatio / SPATIUM20);