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

Merge pull request #90265 from ajreckof/Fix-crash-on-invalid-values-in-EditorPropertyArray/Dict 

Fix crash on invalid values in EditorPropertyArray/Dict
This commit is contained in:
Rémi Verschelde 2024-04-05 17:23:00 +02:00
parent a8e7688b67 866452c75e
commit c493217947
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/editor_properties_array_dict.cpp
View File

@ -328,6 +328,7 @@ void EditorPropertyArray::update_property() {
memdelete(container); memdelete(container);
button_add_item = nullptr; button_add_item = nullptr;
container = nullptr; container = nullptr;
slots.clear();
} }
return; return;
} }
@ -586,7 +587,7 @@ void EditorPropertyArray::_edit_pressed() {
Variant array = get_edited_property_value(); Variant array = get_edited_property_value();
if (!array.is_array() && edit->is_pressed()) { if (!array.is_array() && edit->is_pressed()) {
initialize_array(array); initialize_array(array);
get_edited_object()->set(get_edited_property(), array); emit_changed(get_edited_property(), array);
} }
get_edited_object()->editor_set_section_unfold(get_edited_property(), edit->is_pressed()); get_edited_object()->editor_set_section_unfold(get_edited_property(), edit->is_pressed());
@ -867,7 +868,7 @@ void EditorPropertyDictionary::setup(PropertyHint p_hint) {
void EditorPropertyDictionary::update_property() { void EditorPropertyDictionary::update_property() {
Variant updated_val = get_edited_property_value(); Variant updated_val = get_edited_property_value();
if (updated_val.get_type() == Variant::NIL) { if (updated_val.get_type() != Variant::DICTIONARY) {
edit->set_text(TTR("Dictionary (Nil)")); // This provides symmetry with the array property. edit->set_text(TTR("Dictionary (Nil)")); // This provides symmetry with the array property.
edit->set_pressed(false); edit->set_pressed(false);
if (container) { if (container) {
@ -875,6 +876,7 @@ void EditorPropertyDictionary::update_property() {
memdelete(container); memdelete(container);
button_add_item = nullptr; button_add_item = nullptr;
container = nullptr; container = nullptr;
slots.clear();
} }
return; return;
} }
@ -1021,7 +1023,7 @@ void EditorPropertyDictionary::_edit_pressed() {
Variant prop_val = get_edited_property_value(); Variant prop_val = get_edited_property_value();
if (prop_val.get_type() == Variant::NIL && edit->is_pressed()) { if (prop_val.get_type() == Variant::NIL && edit->is_pressed()) {
VariantInternal::initialize(&prop_val, Variant::DICTIONARY); VariantInternal::initialize(&prop_val, Variant::DICTIONARY);
get_edited_object()->set(get_edited_property(), prop_val); emit_changed(get_edited_property(), prop_val);
} }
get_edited_object()->editor_set_section_unfold(get_edited_property(), edit->is_pressed()); get_edited_object()->editor_set_section_unfold(get_edited_property(), edit->is_pressed());