From 88a6276551cfdf04a248388759a361fc8aace49e Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 26 Oct 2018 11:02:33 +0200 Subject: [PATCH] LSP: Avoid crash in shutdown Having a corrupt language server might end up in a double delete when closing the client. Change-Id: I23e02d666d6c070a9f4b33605782fe875c5cabe6 Reviewed-by: David Schulz --- src/plugins/languageclient/languageclientmanager.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp index a94d2f98cd0..08529046900 100644 --- a/src/plugins/languageclient/languageclientmanager.cpp +++ b/src/plugins/languageclient/languageclientmanager.cpp @@ -205,6 +205,7 @@ void LanguageClientManager::reportFinished(const MessageId &id, BaseClient *byCl void LanguageClientManager::deleteClient(BaseClient *client) { QTC_ASSERT(client, return); + client->disconnect(managerInstance); managerInstance->removeMarks(client->id()); managerInstance->m_clients.removeAll(client); delete client;