Fix crash when deallocating named colors map #20239
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
akien-mga
reviewed
Jul 18, 2018
main/main.cpp
Outdated
| @@ -1649,6 +1651,8 @@ void Main::cleanup() { | |||
| memdelete(script_debugger); | |||
| } | |||
|
|
|||
| Color::_clear_named(); | |||
There was a problem hiding this comment.
Maybe this could go in unregister_core_types() instead? It's already where CoreStringNames and StringName gets cleaned up.
There was a problem hiding this comment.
Eh, didn't notice we already have a place for those, going to move it there :)
There was a problem hiding this comment.
Ping me when it's updated, I'm waiting for this last fix to build 2.1.5 RC2.
bojidar-bg
force-pushed
the
18216-fix-color-crash-2.1
branch
from
c194d8a
to
7a4b8c8
Compare
|
Thanks! Might be worth PR'ing for master and then cherry-picking for 3.0 too, just to be sure. |
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.
Fixes #18216.
Not sure why it doesn't happen on 3.0, but it can be cherrypicked there as well.
The code is a bit of a hack, unfortunately.The code is a bit of a hack, unfortunately.