summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2019-06-24 18:32:53 +0200
committerGitHub <noreply@github.com>2019-06-24 18:32:53 +0200
commit368b34482c346add9be2b3ec9fc5ce20322d67e1 (patch)
tree43316234c069d6ba55c6e9a89d00030659926d08
parent25022a1d89e83bbad6f4e5d8db0a4f1939bbf3ea (diff)
parent0716c59f14383343c1761bc2e0327ebdb2d35d2d (diff)
Merge pull request #30035 from mbrlabs/autoload-fix
Check if autoload nodes are != NULL before deleting them
-rw-r--r--editor/editor_autoload_settings.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp
index 913eb35f8a..9f0b4250a3 100644
--- a/editor/editor_autoload_settings.cpp
+++ b/editor/editor_autoload_settings.cpp
@@ -789,7 +789,7 @@ EditorAutoloadSettings::EditorAutoloadSettings() {
}
}
- if (!info.is_singleton && !info.in_editor) {
+ if (!info.is_singleton && !info.in_editor && info.node != NULL) {
memdelete(info.node);
info.node = NULL;
}