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

… by start repeat barline
musescore · Jun 8, 2024 · fc6854b · fc6854b
1 parent f96203d
commit fc6854b
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/engraving/rendering/dev/tdraw.cpp b/src/engraving/rendering/dev/tdraw.cpp
@@ -822,9 +822,15 @@ void TDraw::draw(const BarLine* item, Painter* painter)
     break;
     }
     Segment* s = item->segment();
-    if (s && s->isEndBarLineType() && !item->score()->printing()) {
-        Measure* m = s->measure();
-        if (m->isIrregular() && item->score()->markIrregularMeasures() && !m->isMMRest()) {
+    if (s && s->isEndBarLineType() && !item->score()->printing() && item->score()->showUnprintable()
+        && item->score()->markIrregularMeasures()) {
+        Measure* m;
+        if (s->isEndBarLineType()) {
+            m = s->measure();
+        } else {
+            m = s->measure()->prevMeasure();
+        }
+        if (m && m->isIrregular() && item->score()->markIrregularMeasures() && !m->isMMRest()) {
             painter->setPen(item->configuration()->formattingMarksColor());
             Font f(u"Edwin", Font::Type::Text);
             f.setPointSizeF(12 * item->spatium() / SPATIUM20);