godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34239 from timothyqiu/theme-clear-32702 

Fixes crash when using Theme::clear
This commit is contained in:
Rémi Verschelde 2019-12-11 08:33:23 +01:00 committed by GitHub
parent 61e89dcd4a c29b8cf751
commit 95eab06471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/resources/theme.cpp
View File

@ -720,7 +720,10 @@ void Theme::clear() {
while ((K = icon_map.next(K))) { while ((K = icon_map.next(K))) {
const StringName *L = NULL; const StringName *L = NULL;
while ((L = icon_map[*K].next(L))) { while ((L = icon_map[*K].next(L))) {
icon_map[*K][*L]->disconnect("changed", this, "_emit_theme_changed"); Ref<Texture> icon = icon_map[*K][*L];
if (icon.is_valid()) {
icon->disconnect("changed", this, "_emit_theme_changed");
}
} }
} }
} }
@ -730,7 +733,10 @@ void Theme::clear() {
while ((K = style_map.next(K))) { while ((K = style_map.next(K))) {
const StringName *L = NULL; const StringName *L = NULL;
while ((L = style_map[*K].next(L))) { while ((L = style_map[*K].next(L))) {
style_map[*K][*L]->disconnect("changed", this, "_emit_theme_changed"); Ref<StyleBox> style = style_map[*K][*L];
if (style.is_valid()) {
style->disconnect("changed", this, "_emit_theme_changed");
}
} }
} }
} }
@ -740,7 +746,10 @@ void Theme::clear() {
while ((K = font_map.next(K))) { while ((K = font_map.next(K))) {
const StringName *L = NULL; const StringName *L = NULL;
while ((L = font_map[*K].next(L))) { while ((L = font_map[*K].next(L))) {
font_map[*K][*L]->disconnect("changed", this, "_emit_theme_changed"); Ref<Font> font = font_map[*K][*L];
if (font.is_valid()) {
font->disconnect("changed", this, "_emit_theme_changed");
}
} }
} }
} }