diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-08-23 08:19:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 08:19:29 +0200 |
| commit | 739cbf45c3c083a47498d1cddb6bd7a92ad040f7 (patch) | |
| tree | 4e2aac8a6a9162794174866e10a4d5a85617eec0 | |
| parent | 9262ad45d6a44e321be5b0ae1eed53bb9fd3c91f (diff) | |
| parent | daf443bcbc8eda493efa55b5ed77575702bcde0c (diff) | |
Merge pull request #31569 from SaracenOne/plugin_shutdown_fix
Fix an exception when trying to close down editor with plugins using autoload singletons
| -rw-r--r-- | editor/editor_autoload_settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index 555a7f99c8..f44e1b7b14 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -439,11 +439,11 @@ void EditorAutoloadSettings::update_autoload() { } if (info.in_editor) { ERR_CONTINUE(!info.node); - get_tree()->get_root()->remove_child(info.node); + get_tree()->get_root()->call_deferred("remove_child", info.node); } if (info.node) { - memdelete(info.node); + info.node->queue_delete(); info.node = NULL; } } |