Merge pull request #75465 from RedworkDE/signal-disconnect-error

Improve error message when disconnecting callable from signal it was not connected to
This commit is contained in:
Rémi Verschelde 2023-05-19 10:09:47 +02:00
commit 9b1b50f2eb
No known key found for this signature in database
GPG Key ID: C3336907360768E1

View File

@ -1350,7 +1350,7 @@ bool Object::_disconnect(const StringName &p_signal, const Callable &p_callable,
}
ERR_FAIL_COND_V_MSG(!s, false, vformat("Disconnecting nonexistent signal '%s' in %s.", p_signal, to_string()));
ERR_FAIL_COND_V_MSG(!s->slot_map.has(*p_callable.get_base_comparator()), false, "Disconnecting nonexistent signal '" + p_signal + "', callable: " + p_callable + ".");
ERR_FAIL_COND_V_MSG(!s->slot_map.has(*p_callable.get_base_comparator()), false, "Attempt to disconnect a nonexistent connection from '" + to_string() + "'. Signal: '" + p_signal + "', callable: '" + p_callable + "'.");
SignalData::Slot *slot = &s->slot_map[*p_callable.get_base_comparator()];