Merge pull request #20531 from mike-spa/fixBendsGlitch

RomanPudashkin · web-flow · commit 7ab45ff538ed · 2023-12-18T12:41:45.000+02:00
Fix bends glitch
diff --git a/src/engraving/rendering/dev/systemlayout.cpp b/src/engraving/rendering/dev/systemlayout.cpp
@@ -514,7 +514,8 @@ System* SystemLayout::collectSystem(LayoutContext& ctx)
         ctx.mutState().setStartWithLongNames(ctx.state().firstSystem() && layoutBreak->startWithLongNames());
     }
 
-    if (oldSystem && oldSystem->tick() >= system->endTick() && !(oldSystem->page() && oldSystem->page() != ctx.state().page())) {
+    if (oldSystem && !oldSystem->measures().empty() && oldSystem->measures().front()->tick() >= system->endTick()
+        && !(oldSystem->page() && oldSystem->page() != ctx.state().page())) {
         // We may have previously processed the ties of the next system (in LayoutChords::updateLineAttachPoints()).
         // We need to restore them to the correct state.
         SystemLayout::restoreTiesAndBends(oldSystem, ctx);

Original file line number	Diff line number	Diff line change
`@@ -514,7 +514,8 @@ System* SystemLayout::collectSystem(LayoutContext& ctx)`
`514`	`514`	`ctx.mutState().setStartWithLongNames(ctx.state().firstSystem() && layoutBreak->startWithLongNames());`
`515`	`515`	`}`
`516`	`516`
`517`		`- if (oldSystem && oldSystem->tick() >= system->endTick() && !(oldSystem->page() && oldSystem->page() != ctx.state().page())) {`
	`517`	`+ if (oldSystem && !oldSystem->measures().empty() && oldSystem->measures().front()->tick() >= system->endTick()`
	`518`	`+ && !(oldSystem->page() && oldSystem->page() != ctx.state().page())) {`
`518`	`519`	`// We may have previously processed the ties of the next system (in LayoutChords::updateLineAttachPoints()).`
`519`	`520`	`// We need to restore them to the correct state.`
`520`	`521`	`SystemLayout::restoreTiesAndBends(oldSystem, ctx);`