godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fix editor crash while exiting debuggger
This commit is contained in:
Rémi Verschelde 2017-07-15 12:34:54 +02:00 committed by GitHub
commit 408f91024c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/script_editor_debugger.cpp
View File

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