Merge pull request #8011 from neikeq/pr-issue-6602-1

Fix connection errors when replacing node
This commit is contained in:
Rémi Verschelde 2017-03-13 11:05:32 +01:00 committed by GitHub
commit 26c12ded24

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);
}
}
}