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

Fix connection errors when replacing node
godotengine · Mar 13, 2017 · 26c12de · 26c12de
2 parents b19b8f7 + d210ac6
commit 26c12de
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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);
+		}
 	}
 }