asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Add two missing Null checks

Browse source 
These Null checks were removed in #10581 but actually changed the
logic of the functions in this case.

This fixes #10654
This commit is contained in:
Hein-Pieter van Braam 2017-08-26 22:53:28 +02:00
parent 53c0010932
commit 3e25cf9e05
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/gdscript/gd_editor.cpp
View file

@ -1546,7 +1546,9 @@ static void _find_type_arguments(GDCompletionContext &context, const GDParser::N
scr = NULL;
}
} else {
on_script = obj->get_script();
if (obj) {
on_script = obj->get_script();
}
}
}
@ -2237,7 +2239,9 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base
scr = NULL;
}
} else {
on_script = obj->get_script();
if (obj) {
on_script = obj->get_script();
}
}
}

5
scene/main/scene_tree.cpp
View file

@ -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);
}
}