port of PR 7569 for master

See wqhttps://github.com/musescore/pull/7569
MarcSabatella · Feb 22, 2021 · 658d47f · 658d47f
1 parent 789d52b
commit 658d47f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/libmscore/layout.cpp b/src/libmscore/layout.cpp
@@ -4187,8 +4187,8 @@ System* Score::collectSystem(LayoutContext& lc)
                         s->setEnabled(true);
                     }
                 }
-                // TODO: use findPotentialSectionBreak here to handle breaks on frames correctly?
-                bool firstSystem = lc.prevMeasure->sectionBreak() && _layoutMode != LayoutMode::FLOAT;
+                const MeasureBase* pbmb = lc.prevMeasure->findPotentialSectionBreak();
+                bool firstSystem = pbmb->sectionBreak() && _layoutMode != LayoutMode::FLOAT;
                 MeasureBase* nm = breakMeasure ? breakMeasure : m;
                 if (curHeader) {
                     m->addSystemHeader(firstSystem);
@@ -5300,7 +5300,7 @@ void Score::doLayoutRange(const Fraction& st, const Fraction& et)
         } else {
             const MeasureBase* mb = lc.nextMeasure->prev();
             if (mb) {
-                mb->findPotentialSectionBreak();
+                mb = mb->findPotentialSectionBreak();
             }
             LayoutBreak* sectionBreak = mb->sectionBreakElement();
             // TODO: also use mb in else clause here?