diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-02-23 21:42:31 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-23 21:42:31 +0100 |
commit | bd76ca01d40b007fec74e945c1f64843882e0f60 (patch) | |
tree | 2e924e123e52b1e82cad7040d3f1e87aca674927 /modules/gdscript | |
parent | c3dc5fe12f1375bcc63270dbe02f2f256072d3b4 (diff) | |
parent | ed482f6167276bebd4132b82a6683392ac41f97a (diff) |
Merge pull request #36485 from ofrank123/master
Fix crash after closing a GDScript LSP session
Diffstat (limited to 'modules/gdscript')
-rw-r--r-- | modules/gdscript/language_server/gdscript_language_protocol.cpp | 4 | ||||
-rw-r--r-- | modules/gdscript/language_server/gdscript_language_protocol.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdscript/language_server/gdscript_language_protocol.cpp b/modules/gdscript/language_server/gdscript_language_protocol.cpp index 2eb1bb441e..2243a7b81d 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.cpp +++ b/modules/gdscript/language_server/gdscript_language_protocol.cpp @@ -122,7 +122,7 @@ Error GDScriptLanguageProtocol::LSPeer::send_data() { Error GDScriptLanguageProtocol::on_client_connected() { Ref<StreamPeerTCP> tcp_peer = server->take_connection(); ERR_FAIL_COND_V_MSG(clients.size() >= LSP_MAX_CLIENTS, FAILED, "Max client limits reached"); - Ref<LSPeer> peer = new LSPeer; + Ref<LSPeer> peer = memnew(LSPeer); peer->connection = tcp_peer; clients.set(next_client_id, peer); next_client_id++; @@ -130,7 +130,7 @@ Error GDScriptLanguageProtocol::on_client_connected() { return OK; } -void GDScriptLanguageProtocol::on_client_disconnected(int p_client_id) { +void GDScriptLanguageProtocol::on_client_disconnected(const int &p_client_id) { clients.erase(p_client_id); EditorNode::get_log()->add_message("Disconnected", EditorLog::MSG_TYPE_EDITOR); } diff --git a/modules/gdscript/language_server/gdscript_language_protocol.h b/modules/gdscript/language_server/gdscript_language_protocol.h index 8596e0300e..3f0ae36af2 100644 --- a/modules/gdscript/language_server/gdscript_language_protocol.h +++ b/modules/gdscript/language_server/gdscript_language_protocol.h @@ -77,7 +77,7 @@ private: Ref<GDScriptWorkspace> workspace; Error on_client_connected(); - void on_client_disconnected(int p_client_id); + void on_client_disconnected(const int &p_client_id); String process_message(const String &p_text); String format_output(const String &p_text); |