Fix connection errors when replacing node

- Avoid connecting the signals to nonexistent methods
- Preserve only persistent connections
This commit is contained in:
Ignacio Etcheverry 2017-03-11 20:21:04 +01:00
parent b043f0e77d
commit d210ac66ef
1 changed files with 5 additions and 2 deletions

View File

@ -2498,8 +2498,11 @@ void Node::_replace_connections_target(Node *p_new_target) {
Connection &c = E->get();
c.source->disconnect(c.signal, this, c.method);
c.source->connect(c.signal, p_new_target, c.method, c.binds, c.flags);
if (c.flags & CONNECT_PERSIST) {
c.source->disconnect(c.signal, this, c.method);
ERR_CONTINUE(!p_new_target->has_method(c.method));
c.source->connect(c.signal, p_new_target, c.method, c.binds, c.flags);
}
}
}