Add two missing Null checks

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

This fixes 
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
modules/gdscript
scene/main

View File

@ -1546,7 +1546,9 @@ static void _find_type_arguments(GDCompletionContext &context, const GDParser::N
scr = NULL; scr = NULL;
} }
} else { } 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; scr = NULL;
} }
} else { } else {
on_script = obj->get_script(); if (obj) {
on_script = obj->get_script();
}
} }
} }

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 *n2 = n->get_node(p_parent);
Node *no = Object::cast_to<Node>(ClassDB::instance(p_type)); 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); n2->add_child(no);
} }
} }