Merge pull request #12771 from GodotExplorer/pr-debugger-fix-2.1

Add null check to fix crashing with debugger
This commit is contained in:
Rémi Verschelde 2017-11-09 11:31:37 +01:00 committed by GitHub
commit 6851d00a20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -90,7 +90,7 @@ void EditorHistory::_add_object(ObjectID p_object, const String &p_property, int
if (obj->is_type("ScriptEditorDebuggerInspectedObject")) {
for (int i = current; i >= 0; i--) {
Object *pre_obj = ObjectDB::get_instance(get_history_obj(i));
if (pre_obj->is_type("ScriptEditorDebuggerInspectedObject")) {
if (pre_obj != NULL && pre_obj->is_type("ScriptEditorDebuggerInspectedObject")) {
if (pre_obj->call("get_remote_object_id") == obj->call("get_remote_object_id")) {
History &pr = history[i];
pr.path[pr.path.size() - 1] = o;