summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorPaulb23 <p_batty@hotmail.co.uk>2019-09-21 16:36:30 +0100
committerPaulb23 <p_batty@hotmail.co.uk>2019-09-21 16:36:30 +0100
commitc3d712f4147a7648f5bf0334705499a7d7433547 (patch)
tree1468e3313cd9c400d8b5855559cd890676bac507 /editor
parent2e065d8ad07bb20fede0d0c0b2d33d6628033024 (diff)
Fix crash when reverting an exported array / dict to NULL
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_properties_array_dict.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/editor/editor_properties_array_dict.cpp b/editor/editor_properties_array_dict.cpp
index ff19be8bd5..8abe91bdc1 100644
--- a/editor/editor_properties_array_dict.cpp
+++ b/editor/editor_properties_array_dict.cpp
@@ -264,7 +264,9 @@ void EditorPropertyArray::update_property() {
edit->set_text(String("(Nil) ") + arrtype);
edit->set_pressed(false);
if (vbox) {
+ set_bottom_editor(NULL);
memdelete(vbox);
+ vbox = NULL;
}
return;
}
@@ -631,7 +633,9 @@ void EditorPropertyDictionary::update_property() {
edit->set_text("Dictionary (Nil)"); //This provides symmetry with the array property.
edit->set_pressed(false);
if (vbox) {
+ set_bottom_editor(NULL);
memdelete(vbox);
+ vbox = NULL;
}
return;
}