fix #175216, fix #269114: Crash with shortcut alt+arrow up/down if mo… #3449
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…re than one element or nothing is selected Fix other related issues with the up-chord/down-chord commands Prevent crash when adjusting the grips of ties
mattmcclinch
commented
Feb 8, 2018
| @@ -153,10 +153,9 @@ void TieSegment::editDrag(EditData& ed) | |||
| // | |||
| if ((g == Grip::START && isSingleBeginType()) || (g == Grip::END && isSingleEndType())) { | |||
| Spanner* spanner = tie(); | |||
| Note* note = toNote(ed.view->elementNear(ed.pos)); | |||
There was a problem hiding this comment.
Casting to a Note before checking that the Element is a Note causes a crash.
mattmcclinch
commented
Feb 8, 2018
| if (el && (el->isNote() || el->isRest())) | ||
| cmdGotoElement(score()->upAlt(el)); | ||
| el = score()->selection().element(); | ||
| while (el->isRest() && toRest(el)->isGap() && el->voice() != 0) { |
There was a problem hiding this comment.
Dereferencing el before making sure that it is not NULL causes a crash. Also, gaps in voice 1 should not be possible. But if there were a gap in voice 1, still handle it correctly.
mattmcclinch
commented
Feb 8, 2018
| @@ -1918,7 +1923,7 @@ void ScoreView::cmd(const char* s) | |||
| if (el && (el->isNote() || el->isRest())) | |||
| cmdGotoElement(score()->downAlt(el)); | |||
| el = score()->selection().element(); | |||
| while (el->isRest() && toRest(el)->isGap() && el->voice() != 3) { | |||
There was a problem hiding this comment.
Making sure that el->voice() != 3 defeats the purpose of the following few lines, which correctly terminate the while loop.
mattmcclinch
commented
Feb 8, 2018
| @@ -197,10 +197,9 @@ Element* Score::upAlt(Element* element) | |||
| Chord* chord = note->chord(); | |||
| const std::vector<Note*>& notes = chord->notes(); | |||
| auto i = std::find(notes.begin(), notes.end(), note); | |||
| if (i != notes.begin()) { | |||
There was a problem hiding this comment.
This causes Alt+up to do nothing if the bottom note of the chord is selected.
lasconic
reviewed
Feb 9, 2018
| && ((g == Grip::END && note->tick() > tie()->tick()) || (g == Grip::START && note->tick() < tie()->tick2())) | ||
| ) { | ||
| Element* e = ed.view->elementNear(ed.pos); | ||
| Note* note = (e && e->isNote()) ? toNote(e) : NULL; |
There was a problem hiding this comment.
We prefer nullptr than NULL.
|
Fixed the NULL -> nullptr and merged manually in 2e112ab |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…re than one element or nothing is selected
Fix other related issues with the up-chord/down-chord commands
Prevent crash when adjusting the grips of ties