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

Fix connection errors when replacing node

1 files changed, 5 insertions, 2 deletions

diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 864e26a651..0245944154 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);
+		}
 	}
 }