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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scene/main/node.cpp
View File

@ -2498,10 +2498,13 @@ void Node::_replace_connections_target(Node *p_new_target) {
Connection &c = E->get(); Connection &c = E->get();
if (c.flags & CONNECT_PERSIST) {
c.source->disconnect(c.signal, this, c.method); 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); c.source->connect(c.signal, p_new_target, c.method, c.binds, c.flags);
} }
} }
}
Vector<Variant> Node::make_binds(VARIANT_ARG_DECLARE) { Vector<Variant> Node::make_binds(VARIANT_ARG_DECLARE) {