From 29fb9fa67ad69a9a1ade931691716106ac9cb355 Mon Sep 17 00:00:00 2001
From: Marc Sabatella <marc@outsideshore.com>
Date: Mon, 21 Dec 2015 22:17:34 -0500
Subject: [PATCH] fix #90766: bad layout with hbox at end of system followed by
 mmrest

---
 libmscore/layout.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
index a66bce610f34..20b0ac360a14 100644
--- 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;
             }