diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-09-23 15:01:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-23 15:01:08 +0200 |
| commit | 06b07eebb5853d24c1aa2776554be5b4f16af147 (patch) | |
| tree | c9a027d80ec2ba400c80669edeafd85d14a36f1e | |
| parent | fc47569be9bffc2d06d2a50e28c7467d9d63c2f6 (diff) | |
| parent | c3d712f4147a7648f5bf0334705499a7d7433547 (diff) | |
Merge pull request #32238 from Paulb23/reset_array_dict_crash
Fix crash when reverting an exported array / dict to NULL
| -rw-r--r-- | editor/editor_properties_array_dict.cpp | 4 |
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; } |