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

Merge pull request #105546 from Splizard/fix_gdextension_tostring

Browse Source 
Fix GDExtension `Object/Node::to_string` to check `is_valid` before returning the result
This commit is contained in:
Thaddeus Crews
2025-04-27 19:21:24 -05:00
parent 1a2a1b07df 23ffdd79e8
commit df78d4a866
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/object/object.cpp
View File

@ -978,8 +978,10 @@ String Object::to_string() {
String ret; String ret;
GDExtensionBool is_valid; GDExtensionBool is_valid;
_extension->to_string(_extension_instance, &is_valid, &ret); _extension->to_string(_extension_instance, &is_valid, &ret);
if (is_valid) {
return ret; return ret;
} }
}
return "<" + get_class() + "#" + itos(get_instance_id()) + ">"; return "<" + get_class() + "#" + itos(get_instance_id()) + ">";
} }

2
scene/main/node.cpp
View File

@ -2864,8 +2864,10 @@ String Node::to_string() {
String ret; String ret;
GDExtensionBool is_valid; GDExtensionBool is_valid;
_get_extension()->to_string(_get_extension_instance(), &is_valid, &ret); _get_extension()->to_string(_get_extension_instance(), &is_valid, &ret);
if (is_valid) {
return ret; return ret;
} }
}
return (get_name() ? String(get_name()) + ":" : "") + Object::to_string(); return (get_name() ? String(get_name()) + ":" : "") + Object::to_string();
} }