|
@@ -2722,9 +2722,15 @@ void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const {
|
|
|
copytarget = p_copy->get_node(ptarget);
|
|
|
}
|
|
|
|
|
|
- if (copy && copytarget) {
|
|
|
- const Callable copy_callable = Callable(copytarget, E.callable.get_method());
|
|
|
+ if (copy && copytarget && E.callable.get_method() != StringName()) {
|
|
|
+ Callable copy_callable = Callable(copytarget, E.callable.get_method());
|
|
|
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);
|
|
|
}
|
|
|
}
|