godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32238 from Paulb23/reset_array_dict_crash 

Fix crash when reverting an exported array / dict to NULL
This commit is contained in:
Rémi Verschelde 2019-09-23 15:01:08 +02:00 committed by GitHub
parent fc47569be9 c3d712f414
commit 06b07eebb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/editor_properties_array_dict.cpp
View File

@ -264,7 +264,9 @@ void EditorPropertyArray::update_property() {
edit->set_text(String("(Nil) ") + arrtype); edit->set_text(String("(Nil) ") + arrtype);
edit->set_pressed(false); edit->set_pressed(false);
if (vbox) { if (vbox) {
set_bottom_editor(NULL);
memdelete(vbox); memdelete(vbox);
vbox = NULL;
} }
return; return;
} }
@ -631,7 +633,9 @@ void EditorPropertyDictionary::update_property() {
edit->set_text("Dictionary (Nil)"); //This provides symmetry with the array property. edit->set_text("Dictionary (Nil)"); //This provides symmetry with the array property.
edit->set_pressed(false); edit->set_pressed(false);
if (vbox) { if (vbox) {
set_bottom_editor(NULL);
memdelete(vbox); memdelete(vbox);
vbox = NULL;
} }
return; return;
} }