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

Object: Avoid error on emit_signal with freed target

Browse Source 
As advised by @reduz.
This commit is contained in:
Rémi Verschelde 2020-01-13 22:11:03 +01:00
parent f38bfccf42
commit 0aeb5bbf62
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/object.cpp
View File

@ -1185,13 +1185,11 @@ Error Object::emit_signal(const StringName &p_name, const Variant **p_args, int
const Connection &c = slot_map.getv(i).conn;
Object *target;
#ifdef DEBUG_ENABLED
target = ObjectDB::get_instance(slot_map.getk(i)._id);
ERR_CONTINUE(!target);
#else
target = c.target;
#endif
Object *target = ObjectDB::get_instance(slot_map.getk(i)._id);
if (!target) {
// Target might have been deleted during signal callback, this is expected and OK.
continue;
}
const Variant **args = p_args;
int argc = p_argcount;