Преглед изворни кода

Merge pull request #55049 from Xwdit/fix_signal_disconnect

Rémi Verschelde пре 3 година
родитељ
комит
eb3cc0e55c
1 измењених фајлова са 1 додато и 1 уклоњено
  1. 1 1
      core/object/object.cpp

+ 1 - 1
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 + ".");
 	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) {
 	if (!p_force) {
 		slot->reference_count--; // by default is zero, if it was not referenced it will go below it
 		slot->reference_count--; // by default is zero, if it was not referenced it will go below it