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

Fix editor crash after disabling plugin that used forward_spatial_gui_input

Browse Source 
Fixes #26124.
This commit is contained in:
Eric Rybicki 2019-02-25 16:49:06 +01:00
parent f74d8b23b0
commit 747b9ac870
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_node.cpp
View File

@ -2542,6 +2542,7 @@ void EditorNode::remove_editor_plugin(EditorPlugin *p_editor, bool p_config_chan
singleton->editor_plugins_over->get_plugins_list().erase(p_editor); singleton->editor_plugins_over->get_plugins_list().erase(p_editor);
singleton->remove_child(p_editor); singleton->remove_child(p_editor);
singleton->editor_data.remove_editor_plugin(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() { void EditorNode::_update_addon_config() {
@ -6059,6 +6060,10 @@ void EditorPluginList::add_plugin(EditorPlugin *p_plugin) {
plugins_list.push_back(p_plugin); plugins_list.push_back(p_plugin);
} }
void EditorPluginList::remove_plugin(EditorPlugin *p_plugin) {
plugins_list.erase(p_plugin);
}
bool EditorPluginList::empty() { bool EditorPluginList::empty() {
return plugins_list.empty(); return plugins_list.empty();
} }

1
editor/editor_node.h
View File

@ -837,6 +837,7 @@ public:
void forward_spatial_draw_over_viewport(Control *p_overlay); void forward_spatial_draw_over_viewport(Control *p_overlay);
void forward_spatial_force_draw_over_viewport(Control *p_overlay); void forward_spatial_force_draw_over_viewport(Control *p_overlay);
void add_plugin(EditorPlugin *p_plugin); void add_plugin(EditorPlugin *p_plugin);
void remove_plugin(EditorPlugin *p_plugin);
void clear(); void clear();
bool empty(); bool empty();