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

Ensure binds are duplicated with `Node` signals 

(cherry picked from commit 9cf13cedfd)
This commit is contained in:
A Thousand Ships 2023-08-16 14:02:43 +02:00 committed by Yuri Sizov
parent e63a7215bb
commit 9c68648d72
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scene/main/node.cpp
View File

@ -2727,9 +2727,15 @@ void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const {
copytarget = p_copy->get_node(ptarget); copytarget = p_copy->get_node(ptarget);
} }
if (copy && copytarget) { if (copy && copytarget && E.callable.get_method() != StringName()) {
const Callable copy_callable = Callable(copytarget, E.callable.get_method()); Callable copy_callable = Callable(copytarget, E.callable.get_method());
if (!copy->is_connected(E.signal.get_name(), copy_callable)) { if (!copy->is_connected(E.signal.get_name(), copy_callable)) {
int arg_count = E.callable.get_bound_arguments_count();
if (arg_count > 0) {
copy_callable = copy_callable.bindv(E.callable.get_bound_arguments());
} else if (arg_count < 0) {
copy_callable = copy_callable.unbind(-arg_count);
}
copy->connect(E.signal.get_name(), copy_callable, E.flags); copy->connect(E.signal.get_name(), copy_callable, E.flags);
} }
} }