LanguageClient: Fix crash after server shutdown

Unconditionally reset the assist provider even to a null pointer

Change-Id: Ie8f87802ab26b4a686704b792adc726a50f98bab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

1 files changed, 3 insertions, 6 deletions

diff --git a/src/plugins/languageclient/client.cpp b/src/plugins/languageclient/client.cpp
index b72bd3dfe1..bac9ea316e 100644
--- a/src/plugins/languageclient/client.cpp
+++ b/src/plugins/languageclient/client.cpp
@@ -1122,16 +1122,13 @@ void Client::resetAssistProviders(TextEditor::TextDocument *document)
 {
     const AssistProviders providers = m_resetAssistProvider.take(document);
 
-    if (document->completionAssistProvider() == m_clientProviders.completionAssistProvider &&
-            providers.completionAssistProvider)
+    if (document->completionAssistProvider() == m_clientProviders.completionAssistProvider)
         document->setCompletionAssistProvider(providers.completionAssistProvider);
 
-    if (document->functionHintAssistProvider() == m_clientProviders.functionHintProvider &&
-            providers.functionHintProvider)
+    if (document->functionHintAssistProvider() == m_clientProviders.functionHintProvider)
         document->setFunctionHintAssistProvider(providers.functionHintProvider);
 
-    if (document->quickFixAssistProvider() == m_clientProviders.quickFixAssistProvider &&
-            providers.quickFixAssistProvider)
+    if (document->quickFixAssistProvider() == m_clientProviders.quickFixAssistProvider)
         document->setQuickFixAssistProvider(providers.quickFixAssistProvider);
 }