summaryrefslogtreecommitdiff
path: root/scene/main/node.cpp
diff options
context:
space:
mode:
authorDualMatrix <piet.goris@gmail.com>2018-10-03 14:59:16 +0200
committerDualMatrix <piet.goris@gmail.com>2018-10-03 14:59:16 +0200
commitcb9559350f491b45ad0f2158fd38c87b35e41c4a (patch)
treed6934bf3d580b7b2b4b9531d941db164f125d4c1 /scene/main/node.cpp
parent0f4c30fb7166e84d93f0b2cb20d726f869155d98 (diff)
Fixed error when duplicating node from editor.
Fixed error when duplicating node from editor.
Diffstat (limited to 'scene/main/node.cpp')
-rw-r--r--scene/main/node.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index d3282c6ada..47ffbe2ff3 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2182,13 +2182,15 @@ void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const {
continue;
}
NodePath ptarget = p_original->get_path_to(target);
- Node *copytarget = p_copy->get_node(ptarget);
- // Cannot find a path to the duplicate target, so it seems it's not part
- // of the duplicated and not yet parented hierarchy, so at least try to connect
+ Node *copytarget = target;
+
+ // Atempt to find a path to the duplicate target, if it seems it's not part
+ // of the duplicated and not yet parented hierarchy then at least try to connect
// to the same target as the original
- if (!copytarget)
- copytarget = target;
+
+ if (p_copy->has_node(ptarget))
+ copytarget = p_copy->get_node(ptarget);
if (copy && copytarget) {
copy->connect(E->get().signal, copytarget, E->get().method, E->get().binds, E->get().flags);