Fix GH#17428: Irregular measure not marked when followed by start rep…

…eat barline
musescore · May 2, 2023 · 1df9e17 · 1df9e17
1 parent aed9b5b
commit 1df9e17
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/engraving/libmscore/barline.cpp b/src/engraving/libmscore/barline.cpp
@@ -734,9 +734,12 @@ void BarLine::draw(Painter* painter) const
     break;
     }
     Segment* s = segment();
-    if (s && s->isEndBarLineType() && !score()->printing() && score()->showUnprintable()) {
+    if (s && !score()->printing() && score()->showUnprintable() && score()->markIrregularMeasures()) {
         Measure* m = s->measure();
-        if (m->isIrregular() && score()->markIrregularMeasures() && !m->isMMRest()) {
+        if ((barLineType() & BarLineType::START_REPEAT) && m->prevMeasure() && (m->prevMeasure()->endBarLineType() != BarLineType::END_REPEAT)) {
+            m = m->prevMeasure();
+        }
+        if (m->isIrregular() && !m->isMMRest()) {
             painter->setPen(engravingConfiguration()->formattingMarksColor());
             draw::Font f(u"Edwin", Font::Type::Text);
             f.setPointSizeF(12 * spatium() / SPATIUM20);