Fix #304333: Using Edit > Preferences causes crash when no score is open #5984
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
mattmcclinch
force-pushed
the
304333-preferences-crash
branch
from
86b99e5 to
c8023d4
Compare
Spire42
reviewed
Apr 23, 2020
mscore/timeline.cpp
Outdated
| @@ -2882,11 +2885,10 @@ const TimelineTheme& Timeline::activeTheme() const | |||
|
|
|||
| void Timeline::updateTimelineTheme() | |||
| { | |||
| scene()->setBackgroundBrush(QBrush(activeTheme().backgroundColor)); | |||
| updateView(); | |||
| QBrush backgroundBrush = QBrush(activeTheme().backgroundColor); | |||
There was a problem hiding this comment.
Would you mind making this const QBrush?
Resolves: https://musescore.org/en/node/304333. It is unnecessary for Timeline::updateTimelineTheme() to call updateView() and drawSelection() since it calls updateGrid() which already calls both of these methods. However, Timeline::updateTimelineTheme() does need to set the background brush for the _rownames object in order to ensure that the new theme applies to the whole timeline.
mattmcclinch
force-pushed
the
304333-preferences-crash
branch
from
c8023d4 to
cd1d693
Compare
Spire42
approved these changes
Apr 23, 2020
igorkorsukov
approved these changes
Apr 23, 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/304333.
It is unnecessary for
Timeline::updateTimelineTheme()to callupdateView()and
drawSelection()since it callsupdateGrid()which already calls bothof these methods. However,
Timeline::updateTimelineTheme()does need to setthe background brush for the
_rownamesobject in order to ensure that thenew theme applies to the whole timeline.