Fix adding tuplets to linked staff corrupts score file #18879 #18887
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
oktophonie
approved these changes
Aug 2, 2023
mike-spa
force-pushed
the
fixAddingTupletsToLinkedStaffCorruptsScoreFile#18879
branch
from
abebb4c
to
6c3ee6f
Compare
mike-spa
force-pushed
the
fixAddingTupletsToLinkedStaffCorruptsScoreFile#18879
branch
from
6c3ee6f
to
30ba40e
Compare
src/engraving/dom/engravingitem.cpp
Outdated
Comment on lines
2124
to
2131
| for (EngravingObject* linked : *links()) { | ||
| EngravingItem* linkedItem = toEngravingItem(linked); | ||
| if (linkedItem->staff() == linkedStaffInScore) { | ||
| return linkedItem; | ||
| } | ||
| } | ||
|
|
||
| return nullptr; |
There was a problem hiding this comment.
Wouldn't it be nice to replace this with findLinkedInStaff(linkedStaffInScore), to reduce repetition and to clarify the intent?
There was a problem hiding this comment.
Oops, that's what I meant to do, I must have forgotten. Done now, thanks
The function did not take into account that an item can have multiple links within the same score (e.g. linked TABs). Now EngravingItem::findLinkedInScore(Score*) returns (if exists) the item linked in the required score AND in a staff with same id. Additionally, EngravingItem::findLinkedInStaff(Staff*) returns if (exists) the linked item in the required staff.
mike-spa
force-pushed
the
fixAddingTupletsToLinkedStaffCorruptsScoreFile#18879
branch
from
30ba40e
to
4e6d03b
Compare
cbjeukendrup
approved these changes
Sep 20, 2023
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: #18879