Merge remote-tracking branch 'origin/6.0'

Change-Id: Ie8406c1854738cabcc85ef6ddaee7559d5227bec
This commit is contained in:
Eike Ziller
2022-01-17 16:52:31 +01:00
13 changed files with 86 additions and 46 deletions

View File

@@ -252,10 +252,12 @@ void LanguageClientManager::shutdown()
return;
qCDebug(Log) << "shutdown manager";
managerInstance->m_shuttingDown = true;
for (Client *client : qAsConst(managerInstance->m_clients))
const auto clients = managerInstance->clients();
for (Client *client : clients)
shutdownClient(client);
QTimer::singleShot(3000, managerInstance, [](){
for (Client *client : qAsConst(managerInstance->m_clients))
QTimer::singleShot(3000, managerInstance, [] {
const auto clients = managerInstance->clients();
for (Client *client : clients)
deleteClient(client);
emit managerInstance->shutdownFinished();
});