ソースを参照

Merge pull request #9655 from GodotExplorer/pr-fix-9653

Fix editor crash while exiting debuggger
Rémi Verschelde 8 年 前
コミット
408f91024c
1 ファイル変更8 行追加3 行削除
  1. 8 3
      editor/script_editor_debugger.cpp

+ 8 - 3
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<ObjectID, ScriptEditorDebuggerInspectedObject *>::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<StreamPeer>());
 
+	inspector = NULL;
+	inspect_properties = NULL;
+
 	server->stop();
 	_clear_remote_objects();
 }