-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[MU4] Fix #319079: Shift Selecting Last Word #7793
[MU4] Fix #319079: Shift Selecting Last Word #7793
Conversation
Now just the commit message (the body) doesn't fit anymore. Unfortunatly this change leads to a crash, if the start and end syllable are in different staves (and the end one is at the end of the score and in a higher staff), it dies of a failed assertion: MuseScore/src/libmscore/select.cpp Line 709 in 19a0584
Independant of whether we'd use the 1st or the 2nd proposed fix, or none at all. Anyway, this hasn't got anything to do with the issue this PR is fixing. |
Anything that I should do to correct the commit message? The updated commit message is only associated with my second commit. Also did some tests around the issue mentioned above. Took a crack at a fix by adding this comparison in the
Surprisingly, with some elementary testing, this seems to resolve the issue. |
Your commit message is fine, but you should squash those 2 commits into just one (and keep the 2nd message). |
c1de600
to
46c1fba
Compare
Changed condition to only check for s1. s2 might be nullptr which marks end of score.
46c1fba
to
9058efa
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, wrong button.
Committing the second fix now :D |
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Works for me!
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947, part 1
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947, part 2
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947, part 1
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947, part 2
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947, part 1
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947, part 2
Changed condition to only check for s1. s2 might be nullptr which marks end of score. Backport of musescore#7793, resp. duplicate of musescore#7947, part 1
Assert enforces ending staffidx to be higher than starting staffidx. This code reverses the two indexes if they don't satisfy idx2 >= idx1. Backport of musescore#7793, resp. duplicate of musescore#7947, part 2
Resolves: https://musescore.org/en/node/319079
Original code only attempts to find the next ChordRest segment as the end marker for selecting a range, this fix adds the detection for the EndBarLine segment as a potential end marker, which resolves the issue.