feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LanguageClient: Fix crash after server shutdown

Browse Source 
Unconditionally reset the assist provider even to a null pointer

Change-Id: Ie8f87802ab26b4a686704b792adc726a50f98bab
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-09-08 12:23:20 +02:00
parent 2fa0e96f19
commit 44271262d9
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/languageclient/client.cpp
View File

@@ -1122,16 +1122,13 @@ void Client::resetAssistProviders(TextEditor::TextDocument *document)
{ {
const AssistProviders providers = m_resetAssistProvider.take(document); const AssistProviders providers = m_resetAssistProvider.take(document);
if (document->completionAssistProvider() == m_clientProviders.completionAssistProvider && if (document->completionAssistProvider() == m_clientProviders.completionAssistProvider)
providers.completionAssistProvider)
document->setCompletionAssistProvider(providers.completionAssistProvider); document->setCompletionAssistProvider(providers.completionAssistProvider);
if (document->functionHintAssistProvider() == m_clientProviders.functionHintProvider && if (document->functionHintAssistProvider() == m_clientProviders.functionHintProvider)
providers.functionHintProvider)
document->setFunctionHintAssistProvider(providers.functionHintProvider); document->setFunctionHintAssistProvider(providers.functionHintProvider);
if (document->quickFixAssistProvider() == m_clientProviders.quickFixAssistProvider && if (document->quickFixAssistProvider() == m_clientProviders.quickFixAssistProvider)
providers.quickFixAssistProvider)
document->setQuickFixAssistProvider(providers.quickFixAssistProvider); document->setQuickFixAssistProvider(providers.quickFixAssistProvider);
} }