summaryrefslogtreecommitdiffstats
path: root/editor/import_defaults_editor.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2021-02-25 16:05:28 +0100
committerGitHub <noreply@github.com>2021-02-25 16:05:28 +0100
commit369dffc2179b41477a9baa566ed70b94d14b967a (patch)
treee8d2dfa25c892dc4b32fa4664f31613b061d141d /editor/import_defaults_editor.cpp
parent68ebcb915e17eac7fb40922545ab644e02138d5a (diff)
parentf2ad7c5f127d744b1b34c0a7dcd423426d3503ea (diff)
downloadredot-engine-369dffc2179b41477a9baa566ed70b94d14b967a.tar.gz
Merge pull request #46399 from YeldhamDev/import_defaults_another_fix
Fix heap-use-after-free in Import Defaults Editor
Diffstat (limited to 'editor/import_defaults_editor.cpp')
-rw-r--r--editor/import_defaults_editor.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/editor/import_defaults_editor.cpp b/editor/import_defaults_editor.cpp
index 28c595614f..43b97eb910 100644
--- a/editor/import_defaults_editor.cpp
+++ b/editor/import_defaults_editor.cpp
@@ -69,6 +69,12 @@ protected:
}
};
+void ImportDefaultsEditor::_notification(int p_what) {
+ if (p_what == NOTIFICATION_PREDELETE) {
+ inspector->edit(nullptr);
+ }
+}
+
void ImportDefaultsEditor::_reset() {
if (settings->importer.is_valid()) {
settings->values = settings->default_values;
@@ -206,6 +212,5 @@ ImportDefaultsEditor::ImportDefaultsEditor() {
}
ImportDefaultsEditor::~ImportDefaultsEditor() {
- inspector->edit(nullptr);
memdelete(settings);
}