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

Merge pull request #64837 from YuriSizov/control-disconnect-from-everything-and-free-yourself

Browse Source 
Disconnect Control from theme resources to avoid issues on destruction
This commit is contained in:
Rémi Verschelde 2022-08-25 00:04:17 +02:00 committed by GitHub
commit efedef8eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scene/gui/control.cpp
View File

@ -3622,3 +3622,24 @@ void Control::_bind_methods() {
GDVIRTUAL_BIND(_gui_input, "event");
}
Control::~Control() {
// Resources need to be disconnected.
for (KeyValue<StringName, Ref<Texture2D>> &E : data.icon_override) {
E.value->disconnect("changed", callable_mp(this, &Control::_theme_property_override_changed));
}
for (KeyValue<StringName, Ref<StyleBox>> &E : data.style_override) {
E.value->disconnect("changed", callable_mp(this, &Control::_theme_property_override_changed));
}
for (KeyValue<StringName, Ref<Font>> &E : data.font_override) {
E.value->disconnect("changed", callable_mp(this, &Control::_theme_property_override_changed));
}
// Then override maps can be simply cleared.
data.icon_override.clear();
data.style_override.clear();
data.font_override.clear();
data.font_size_override.clear();
data.color_override.clear();
data.constant_override.clear();
}

1
scene/gui/control.h
View File

@ -610,6 +610,7 @@ public:
virtual Control *make_custom_tooltip(const String &p_text) const;
Control() {}
~Control();
};
VARIANT_ENUM_CAST(Control::FocusMode);