Fix #306917: Crash on tie in score with parts #6242
Merged
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
njvdberg
reviewed
Jun 21, 2020
libmscore/edit.cpp
Outdated
| tr = staff->score()->excerpt()->tracks().values(strack); | ||
| else if ((strack & ~3) != staffIdx) // linked staff ? |
There was a problem hiding this comment.
I saw this test at several places but I think this is not correct to find linked staves. In PR #6049 I used another way to find linked parts and linked staves. This PR isn't merged in master so please have a look in undoAddCR.
There was a problem hiding this comment.
Thanks! I am now using your code, although it should probably be refactored in order to avoid code duplication.
There was a problem hiding this comment.
I'm working on a kind of "API" regarding linked staves and parts so we don't have to reinvent the same square wheel again 😃
libmscore/edit.cpp
Outdated
| @@ -4567,7 +4568,8 @@ void Score::undoAddElement(Element* element) | |||
|
|
|||
| int it = 0; | |||
| for (int ntrack : tr) { | |||
| if ((ntrack & ~3) != staffIdx * VOICES) { | |||
| // Skip this track if it is in a linked staff within the same Score, unless adding a Tie | |||
| if ((ntrack & ~3) != staffIdx * VOICES && !element->isTie()) { | |||
There was a problem hiding this comment.
Actually, I think I can delete this bit altogether, now that I am using your method for constructing the list of tracks.
mattmcclinch
force-pushed
the
306917-tie-crash
branch
from
aa4de0b to
d01c55d
Compare
Resolves: https://musescore.org/en/node/306917. Apply the same method from https:://github.com/musescore/pull/6049 in undoAddElement() for determining the tracks in which to place new elements.
mattmcclinch
force-pushed
the
306917-tie-crash
branch
from
d01c55d to
3a8bdf1
Compare
29 tasks
anatoly-os
added a commit
that referenced
this pull request
Aug 11, 2020
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.
Resolves: https://musescore.org/en/node/306917.
This now uses the same method from #6049 in undoAddElement() for determining the tracks in which to place new elements.