diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-22 14:52:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 14:52:54 +0100 |
| commit | 409de53e7253a0e900b09aedb983d998ccf30659 (patch) | |
| tree | dd536babb72fca1de1826bea932f7b302368eaf7 /core/object.cpp | |
| parent | 829d21f1c223a159f58cc3f30a98a63ce1f3a9d2 (diff) | |
| parent | 41f59ecfca6ddea1eb7b023aaea75e80e3c30c5c (diff) | |
Merge pull request #35423 from Faless/fix/object_emit_free
Make sure we know when deleting an emitting object
Diffstat (limited to 'core/object.cpp')
| -rw-r--r-- | core/object.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/object.cpp b/core/object.cpp index 21666a334c..21a3b2cc6c 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -1213,9 +1213,9 @@ Error Object::emit_signal(const StringName &p_name, const Variant **p_args, int MessageQueue::get_singleton()->push_call(target->get_instance_id(), c.method, args, argc, true); } else { Variant::CallError ce; - s->lock++; + _emitting = true; target->call(c.method, args, argc, ce); - s->lock--; + _emitting = false; if (ce.error != Variant::CallError::CALL_OK) { #ifdef DEBUG_ENABLED @@ -1920,6 +1920,7 @@ Object::Object() { _instance_id = ObjectDB::add_instance(this); _can_translate = true; _is_queued_for_deletion = false; + _emitting = false; instance_binding_count = 0; memset(_script_instance_bindings, 0, sizeof(void *) * MAX_SCRIPT_INSTANCE_BINDINGS); script_instance = NULL; @@ -1942,15 +1943,15 @@ Object::~Object() { const StringName *S = NULL; + if (_emitting) { + //@todo this may need to actually reach the debugger prioritarily somehow because it may crash before + ERR_PRINTS("Object " + to_string() + " was freed or unreferenced while a signal is being emitted from it. Try connecting to the signal using 'CONNECT_DEFERRED' flag, or use queue_free() to free the object (if this object is a Node) to avoid this error and potential crashes."); + } + while ((S = signal_map.next(NULL))) { Signal *s = &signal_map[*S]; - if (s->lock > 0) { - //@todo this may need to actually reach the debugger prioritarily somehow because it may crash before - ERR_PRINTS("Object was freed or unreferenced while signal '" + String(*S) + "' is being emitted from it. Try connecting to the signal using 'CONNECT_DEFERRED' flag, or use queue_free() to free the object (if this object is a Node) to avoid this error and potential crashes."); - } - //brute force disconnect for performance int slot_count = s->slot_map.size(); const VMap<Signal::Target, Signal::Slot>::Pair *slot_list = s->slot_map.get_array(); |