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

Merge pull request #82171 from timothyqiu/sep-leak

Browse Source 
Fix leak when calling `remove_control_from_menu_panel`
This commit is contained in:
Rémi Verschelde 2023-09-24 23:34:35 +02:00
commit 04317bc784
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -4979,9 +4979,11 @@ void CanvasItemEditor::remove_control_from_menu_panel(Control *p_control) {
p_control->disconnect("visibility_changed", callable_mp(this, &CanvasItemEditor::_update_context_toolbar)); p_control->disconnect("visibility_changed", callable_mp(this, &CanvasItemEditor::_update_context_toolbar));
context_toolbar_hbox->remove_child(context_toolbar_separators[p_control]); VSeparator *sep = context_toolbar_separators[p_control];
context_toolbar_hbox->remove_child(sep);
context_toolbar_hbox->remove_child(p_control); context_toolbar_hbox->remove_child(p_control);
context_toolbar_separators.erase(p_control); context_toolbar_separators.erase(p_control);
memdelete(sep);
_update_context_toolbar(); _update_context_toolbar();
} }

4
editor/plugins/node_3d_editor_plugin.cpp
View File

@ -7695,9 +7695,11 @@ void Node3DEditor::remove_control_from_menu_panel(Control *p_control) {
p_control->disconnect("visibility_changed", callable_mp(this, &Node3DEditor::_update_context_toolbar)); p_control->disconnect("visibility_changed", callable_mp(this, &Node3DEditor::_update_context_toolbar));
context_toolbar_hbox->remove_child(context_toolbar_separators[p_control]); VSeparator *sep = context_toolbar_separators[p_control];
context_toolbar_hbox->remove_child(sep);
context_toolbar_hbox->remove_child(p_control); context_toolbar_hbox->remove_child(p_control);
context_toolbar_separators.erase(p_control); context_toolbar_separators.erase(p_control);
memdelete(sep);
_update_context_toolbar(); _update_context_toolbar();
} }