summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-05-17 12:55:38 +0200
committerGitHub <noreply@github.com>2021-05-17 12:55:38 +0200
commitc6bef537274e65620b40b9f5f1937d2332a249df (patch)
treea9e6808a7368c7e36b54e911699887bef4e06afa
parent7731a507940bf51a6d28ed9b30492e1be2906fb4 (diff)
parent5a8314016a7bcb87f840ac5110e18ebb09daefa7 (diff)
Merge pull request #48781 from kleonc/plugin-force_draw_over-crash-fix
Fix crash after disabling plugin using set_force_draw_over_forwarding_enabled()
-rw-r--r--editor/editor_node.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 61b17a7247..6e94b6cdc9 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -3093,10 +3093,11 @@ void EditorNode::remove_editor_plugin(EditorPlugin *p_editor, bool p_config_chan
if (p_config_changed) {
p_editor->disable_plugin();
}
- singleton->editor_plugins_over->get_plugins_list().erase(p_editor);
+ singleton->editor_plugins_over->remove_plugin(p_editor);
+ singleton->editor_plugins_force_over->remove_plugin(p_editor);
+ singleton->editor_plugins_force_input_forwarding->remove_plugin(p_editor);
singleton->remove_child(p_editor);
singleton->editor_data.remove_editor_plugin(p_editor);
- singleton->get_editor_plugins_force_input_forwarding()->remove_plugin(p_editor);
}
void EditorNode::_update_addon_config() {