From d210ac66ef8bbe056c014ba90fd2a12611b51648 Mon Sep 17 00:00:00 2001 From: Ignacio Etcheverry Date: Sat, 11 Mar 2017 20:21:04 +0100 Subject: [PATCH] Fix connection errors when replacing node - Avoid connecting the signals to nonexistent methods - Preserve only persistent connections --- scene/main/node.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scene/main/node.cpp b/scene/main/node.cpp index 864e26a651c..0245944154a 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -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); + } } }