summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-04-20 10:25:39 +0200
committerGitHub <noreply@github.com>2019-04-20 10:25:39 +0200
commitb3d2584960dd7ede84591996ac1f880dd87106fe (patch)
treea64e82c544fd997b255fd2a5a8d9748e0bd43101 /scene
parentc1444ebeaf4a17e5c3489dded45ae71f96341bd3 (diff)
parent20b0046945bfe55591c370e32f4928f7cbeb45e6 (diff)
Merge pull request #28210 from hpvb/fix-28134
Object::script may not be a valid Ref<Script>
Diffstat (limited to 'scene')
-rw-r--r--scene/main/node.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/main/node.cpp b/scene/main/node.cpp
index 5f9c187e0b..cbe700c826 100644
--- a/scene/main/node.cpp
+++ b/scene/main/node.cpp
@@ -2421,7 +2421,7 @@ void Node::_replace_connections_target(Node *p_new_target) {
if (c.flags & CONNECT_PERSIST) {
c.source->disconnect(c.signal, this, c.method);
- bool valid = p_new_target->has_method(c.method) || p_new_target->get_script().is_null() || Ref<Script>(p_new_target->get_script())->has_method(c.method);
+ bool valid = p_new_target->has_method(c.method) || Ref<Script>(p_new_target->get_script()).is_null() || Ref<Script>(p_new_target->get_script())->has_method(c.method);
ERR_EXPLAIN("Attempt to connect signal \'" + c.source->get_class() + "." + c.signal + "\' to nonexistent method \'" + c.target->get_class() + "." + c.method + "\'");
ERR_CONTINUE(!valid);
c.source->connect(c.signal, p_new_target, c.method, c.binds, c.flags);