fix #317747: measure number appears after section break #7569
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
Resolves: https://musescore.org/en/node/317747#comment-1063687 In implementing a bunch of related fixes for the behavior of section breaks followed by frames or breaks *on* frames* in musescore#7026, I introduced a new function designed to find relevant section breaks. However, I missed one opportunity to use this function (even though I left a TODO for this), and in one place where I did call the function, I neglected to actually use its return value. As a result, in one situation where it previously worked to place the section break on a frame but failed when placing the frame after the section break, my change merely reversed these two cases. This commit fixes those two oversights. In these two places where the code previously assumed we had a MeasureBase that made sense to check for section breaks, we now call findPotentialSectionBreak() to look backwards. This ensures we don't miss breaks on or before frames in these two places in the code.
MarcSabatella
added a commit
to MarcSabatella/MuseScore
that referenced
this pull request
Feb 22, 2021
See wqhttps://github.com/musescore/pull/7569
vpereverzev
pushed a commit
that referenced
this pull request
Feb 24, 2021
See wqhttps://github.com//pull/7569
|
counterpart got merged to master |
|
needed in 3.x too though |
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/317747#comment-1063687
In implementing a bunch of related fixes for the behavior of
section breaks followed by frames or breaks on frames*
in #7026,
I introduced a new function designed to find relevant section breaks.
However, I missed one opportunity to use this function
(even though I left a TODO for this),
and in one place where I did call the function,
I neglected to actually use its return value.
As a result, in one situation where it previously worked
to place the section break on a frame
but failed when placing the frame after the section break,
my change merely reversed these two cases.
This commit fixes those two oversights.
In these two places where the code previously assumed
we had a MeasureBase that made sense to check for section breaks,
we now call findPotentialSectionBreak() to look backwards.
This ensures we don't miss breaks on or before frames
in these two places in the code.