Merge pull request #20131 from Eism/grace_notes_navigation_fix

fixed #20130: Crash when navigating grace note after main note at the end of measure with Alt+Right arrow
musescore · Nov 21, 2023 · acb1bad · acb1bad
2 parents 50cd91f + d8e1922
commit acb1bad
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/engraving/dom/chord.cpp b/src/engraving/dom/chord.cpp
@@ -2796,7 +2796,10 @@ EngravingItem* Chord::prevElement()
 
                 ChordRest* next = prevChordRest(this);
                 if (next) {
-                    return toChord(next)->notes().back();
+                    if (next->isChord()) {
+                        return toChord(next)->notes().back();
+                    }
+                    return toRest(next);
                 }
             }
         }

diff --git a/src/engraving/dom/note.cpp b/src/engraving/dom/note.cpp
@@ -3270,11 +3270,6 @@ EngravingItem* Note::nextElement()
             if (graceNotesAfterFirstChord) {
                 return graceNotesAfterFirstChord->notes().front();
             }
-        } else if (isGrace()) {
-            ChordRest* next = nextChordRest(chord());
-            if (next) {
-                return toChord(next)->notes().front();
-            }
         }
 
         if (!m_el.empty()) {

diff --git a/src/engraving/dom/segment.cpp b/src/engraving/dom/segment.cpp
@@ -1667,7 +1667,10 @@ EngravingItem* Segment::prevElementOfSegment(Segment* s, EngravingItem* e, staff
             if (!graceNotesBefore.empty()) {
                 ChordRest* next = prevChordRest(chord);
                 if (next) {
-                    return toChord(next)->notes().back();
+                    if (next->isChord()) {
+                        return toChord(next)->notes().back();
+                    }
+                    return toRest(next);
                 }
             }