Merge pull request #18782 from mike-spa/port#18777

Port #18780: Fix crash for trills with accidentals on tied notes
musescore · Jul 24, 2023 · 691f32f · 691f32f
2 parents dfdbbec + 2426a6c
commit 691f32f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/engraving/libmscore/cmd.cpp b/src/engraving/libmscore/cmd.cpp
@@ -2010,9 +2010,7 @@ static void changeAccidental2(Note* n, int pitch, int tpc)
                 }
             }
         } else {
-            Note* nn = n;
-            while (nn->tieFor()) {
-                nn = nn->tieFor()->endNote();
+            for (Note* nn = n; nn && nn->tieFor(); nn = nn->tieFor()->endNote()) {
                 score->undo(new ChangePitch(nn, pitch, tpc1, tpc2));
             }
         }

diff --git a/src/engraving/libmscore/ornament.cpp b/src/engraving/libmscore/ornament.cpp
@@ -249,6 +249,10 @@ void Ornament::computeNotesAboveAndBelow(AccidentalState* accState)
 
         if (!note) {
             note = mainNote->clone();
+            Tie* tie = note->tieFor();
+            if (tie) {
+                score()->undoRemoveElement((EngravingItem*)tie);
+            }
         } else {
             note->setTpc1(mainNote->tpc1());
             note->setTpc2(mainNote->tpc2());

diff --git a/vtest/scores/ornament-8.mscz b/vtest/scores/ornament-8.mscz