fix #73801: SECTION_BREAK on non-measure MEASURE_BASE does not reset …

…measure numbering in next section
musescore · Aug 18, 2015 · 221c482 · 221c482
1 parent c6796fc
commit 221c482
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -1454,12 +1454,12 @@ void Score::doLayout()
                   Measure* measure = static_cast<Measure*>(m);
                   measureNo += measure->noOffset();
                   measure->setNo(measureNo);
-                  if (measure->sectionBreak() && measure->sectionBreak()->startWithMeasureOne())
-                        measureNo = 0;
-                  else if (!measure->irregular())      // dont count measure
+                  if (!measure->irregular())      // dont count measure
                         ++measureNo;
                   measure->layoutStage1();
                   }
+            if (m->sectionBreak() && m->sectionBreak()->startWithMeasureOne())
+                  measureNo = 0;
             }
 
       if (styleB(StyleIdx::createMultiMeasureRests))