From 9502af3e98150b67506cbb6747534d4884a7e2c6 Mon Sep 17 00:00:00 2001
From: Marc Sabatella <marc@outsideshore.com>
Date: Mon, 9 Mar 2015 20:16:46 -0600
Subject: [PATCH] fix #24100: bad layout of horizontal frame

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

diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
index 5323b7fff663..8a2fce92be12 100644
--- a/libmscore/layout.cpp
+++ b/libmscore/layout.cpp
@@ -2280,6 +2280,7 @@ bool Score::layoutSystem(qreal& minWidth, qreal systemWidth, bool isFirstSystem,
 
             if (!empty && (minWidth + ww > systemWidth)) {
                   curMeasure->setSystem(oldSystem);
+                  continueFlag = false;
                   break;
                   }
             if (curMeasure->type() == Element::Type::MEASURE)
@@ -2310,6 +2311,7 @@ bool Score::layoutSystem(qreal& minWidth, qreal systemWidth, bool isFirstSystem,
                ) {
                   if (_layoutMode != LayoutMode::SYSTEM)
                         system->setPageBreak(curMeasure->pageBreak());
+                  minWidth += ww;
                   curMeasure = nextMeasure;
                   break;
                   }