From 0bd96bd2cfbb2ffd3549d09b92e4c58a50fbd032 Mon Sep 17 00:00:00 2001 From: Xwdit <44023235+Xwdit@users.noreply.github.com> Date: Wed, 17 Nov 2021 09:29:29 +0100 Subject: [PATCH] Fix the exceptions in signal disconnection Use the correct method to get SignalData to fix exceptions in signal disconnection --- core/object/object.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/object/object.cpp b/core/object/object.cpp index 8e96695f0d3..90bd697d371 100644 --- a/core/object/object.cpp +++ b/core/object/object.cpp @@ -1410,7 +1410,7 @@ void Object::_disconnect(const StringName &p_signal, const Callable &p_callable, ERR_FAIL_COND_MSG(!s->slot_map.has(*p_callable.get_base_comparator()), "Disconnecting nonexistent signal '" + p_signal + "', callable: " + p_callable + "."); - SignalData::Slot *slot = &s->slot_map[p_callable]; + SignalData::Slot *slot = &s->slot_map[*p_callable.get_base_comparator()]; if (!p_force) { slot->reference_count--; // by default is zero, if it was not referenced it will go below it