summaryrefslogtreecommitdiffstats
path: root/scene/main
diff options
context:
space:
mode:
authorHein-Pieter van Braam <hp@tmm.cx>2017-08-26 22:53:28 +0200
committerHein-Pieter van Braam <hp@tmm.cx>2017-08-26 23:40:45 +0200
commit3e25cf9e05103e3ef3279c93c9e9170cbcc7eaaf (patch)
tree30466dffa48e44147b8d592dda7279c35105346d /scene/main
parent53c0010932f9c1becb63c16243f3a00ede359989 (diff)
downloadredot-engine-3e25cf9e05103e3ef3279c93c9e9170cbcc7eaaf.tar.gz
Add two missing Null checks
These Null checks were removed in #10581 but actually changed the logic of the functions in this case. This fixes #10654
Diffstat (limited to 'scene/main')
-rw-r--r--scene/main/scene_tree.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp
index 03a604734e..33331a465f 100644
--- a/scene/main/scene_tree.cpp
+++ b/scene/main/scene_tree.cpp
@@ -1401,8 +1401,11 @@ void SceneTree::_live_edit_create_node_func(const NodePath &p_parent, const Stri
Node *n2 = n->get_node(p_parent);
Node *no = Object::cast_to<Node>(ClassDB::instance(p_type));
- no->set_name(p_name);
+ if (!no) {
+ continue;
+ }
+ no->set_name(p_name);
n2->add_child(no);
}
}