Merge pull request #6180 from njvdberg/issue-306333-measure-numbering

Fix #306333 - Various type of edits change the measure count
musescore · Jun 9, 2020 · 7bbcb88 · 7bbcb88
2 parents 52a9b9e + bb057bb
commit 7bbcb88
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -4623,8 +4623,8 @@ void Score::doLayoutRange(const Fraction& st, const Fraction& et)
                   if (sectionBreak && sectionBreak->startWithMeasureOne())
                         lc.measureNo = 0;
                   else
-                        lc.measureNo = lc.nextMeasure->prevMeasure()->no() + 1; // will be adjusted later with respect
-                                                                                // to the user-defined offset.
+                        lc.measureNo = lc.nextMeasure->prevMeasure()->no()                     // will be adjusted later with respect
+                                       + (lc.nextMeasure->prevMeasure()->irregular() ? 0 : 1); // to the user-defined offset.
                   lc.tick      = lc.nextMeasure->tick();
                   }
             }