diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index ac2230a28dc..aaba0421f72 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -1675,8 +1675,11 @@ void ScriptEditorDebugger::_set_remote_object(ObjectID p_id, ScriptEditorDebugge void ScriptEditorDebugger::_clear_remote_objects() { - inspector->edit(NULL); - inspect_properties->edit(NULL); + if (inspector) + inspector->edit(NULL); + + if (inspect_properties) + inspect_properties->edit(NULL); for (Map::Element *E = remote_objects.front(); E; E = E->next()) { memdelete(E->value()); @@ -2024,9 +2027,11 @@ ScriptEditorDebugger::~ScriptEditorDebugger() { // inspector->edit(NULL); memdelete(variables); - ppeer->set_stream_peer(Ref()); + inspector = NULL; + inspect_properties = NULL; + server->stop(); _clear_remote_objects(); }