Merge pull request #3599 from mattmcclinch/251471-measure-counting

fix #251471: Measure counting becomes wrong after multi measure rests
musescore · Apr 5, 2018 · 8e55ae1 · 8e55ae1
2 parents 7281733 + b537e36
commit 8e55ae1
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -2515,11 +2515,15 @@ void Score::getNextMeasure(LayoutContext& lc)
       // even if they are equivalent 4/4 vs 2/2
       // also check if nominal time signature has changed
 
-      if (isMaster() && (!measure->len().identical(lc.sig)
+      if (isMaster() && ((!measure->len().identical(lc.sig)
+         && measure->len() != lc.sig * measure->mmRestCount())
          || (lc.prevMeasure && lc.prevMeasure->isMeasure()
          && !measure->timesig().identical(toMeasure(lc.prevMeasure)->timesig()))))
             {
-            lc.sig = measure->len();
+            if (measure->isMMRest())
+                  lc.sig = measure->mmRestFirst()->len();
+            else
+                  lc.sig = measure->len();
             sigmap()->add(lc.tick, SigEvent(lc.sig, measure->timesig(), measure->no()));
             }