Browse Source

Merge pull request #32238 from Paulb23/reset_array_dict_crash

Fix crash when reverting an exported array / dict to NULL
Rémi Verschelde 5 years ago
parent
commit
06b07eebb5
1 changed files with 4 additions and 0 deletions
  1. 4 0
      editor/editor_properties_array_dict.cpp

+ 4 - 0
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;
 	}