Merge pull request #27782 from mike-spa/fixCrashOnSetOrnamentStyle

oktophonie · web-flow · commit fddcae667076 · 2025-04-22T16:00:28.000+03:00
Fix crash on set ornament style to always show cue note
diff --git a/src/engraving/dom/ornament.cpp b/src/engraving/dom/ornament.cpp
@@ -237,7 +237,7 @@ bool Ornament::hasFullIntervalChoice() const
 bool Ornament::showCueNote()
 {
     if (m_showCueNote == AutoOnOff::AUTO) {
-        return style().styleB(Sid::trillAlwaysShowCueNote) || _intervalAbove.step != IntervalStep::SECOND;
+        return (hasFullIntervalChoice() && style().styleB(Sid::trillAlwaysShowCueNote)) || _intervalAbove.step != IntervalStep::SECOND;
     }
 
     return m_showCueNote == AutoOnOff::ON;

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ bool Ornament::hasFullIntervalChoice() const`
`237`	`237`	`bool Ornament::showCueNote()`
`238`	`238`	`{`
`239`	`239`	`if (m_showCueNote == AutoOnOff::AUTO) {`
`240`		`- return style().styleB(Sid::trillAlwaysShowCueNote) \|\| _intervalAbove.step != IntervalStep::SECOND;`
	`240`	`+ return (hasFullIntervalChoice() && style().styleB(Sid::trillAlwaysShowCueNote)) \|\| _intervalAbove.step != IntervalStep::SECOND;`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`return m_showCueNote == AutoOnOff::ON;`