fix #90766: bad layout with hbox at end of system followed by mmrest

musescore · Jan 12, 2016 · 29fb9fa · 29fb9fa
1 parent 647c416
commit 29fb9fa
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -2826,6 +2826,14 @@ QList<System*> Score::layoutSystemRow(qreal rowWidth, bool isFirstSystem, bool u
                         curMeasure = curMeasure->prev();
                   else
                         curMeasure = last();
+                  // skip to beginning of mmrest
+                  if (curMeasure && curMeasure->isMeasure() && styleB(StyleIdx::createMultiMeasureRests)) {
+                        Measure* m = static_cast<Measure*>(curMeasure);
+                        while (m && m->mmRestCount() < 0)
+                              m = m->prevMeasure();
+                        if (m && m->hasMMRest())
+                              curMeasure = m->mmRest();
+                        }
                   }
             firstInRow = false;
             }