tiennm99/godot
1
0
Fork 0
mirror of https://github.com/tiennm99/godot.git synced 2026-08-06 20:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Warn of invalid pointer when converting object to RID, closes #19023

Browse Source
This commit is contained in:
Juan Linietsky
2019-01-26 15:41:26 -03:00
parent b203f80dfc
commit c2f59de212
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/variant.cpp
+8
View File
@@ -1731,6 +1731,14 @@ Variant::operator RID() const {
else if (type == OBJECT && !_get_obj().ref.is_null()) {
return _get_obj().ref.get_rid();
} else if (type == OBJECT && _get_obj().obj) {
#ifdef DEBUG_ENABLED
if (ScriptDebugger::get_singleton()) {
if (!ObjectDB::instance_validate(_get_obj().obj)) {
ERR_EXPLAIN("Invalid pointer (object was deleted)");
ERR_FAIL_V(RID());
};
};
#endif
Variant::CallError ce;
Variant ret = _get_obj().obj->call(CoreStringNames::get_singleton()->get_rid, NULL, 0, ce);
if (ce.error == Variant::CallError::CALL_OK && ret.get_type() == Variant::_RID) {