From 5a8314016a7bcb87f840ac5110e18ebb09daefa7 Mon Sep 17 00:00:00 2001
From: kleonc <9283098+kleonc@users.noreply.github.com>
Date: Mon, 17 May 2021 10:46:59 +0200
Subject: [PATCH] Fix crash after disabling plugin using
 set_force_draw_over_forwarding_enabled()

---
 editor/editor_node.cpp | 5 +++--
 1 file 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() {