From 52cfa8b6f8c7c8f5f88617c897f27975092c5420 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Wed, 24 Oct 2018 08:55:27 +0200
Subject: [PATCH] LSP: forcefully close language server after 3 seconds on
 shutdown

When closing Qt Creator a message is send to the server requesting to
shutdown. Waiting an undefined amount of time for the response could
result in a never closing Qt Creator.

Change-Id: If09a32d34c546ae4702669d65e4921873e5658ea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/languageclient/languageclientmanager.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp
index d609596c367..a94d2f98cd0 100644
--- a/src/plugins/languageclient/languageclientmanager.cpp
+++ b/src/plugins/languageclient/languageclientmanager.cpp
@@ -221,6 +221,11 @@ void LanguageClientManager::shutdown()
         else
             deleteClient(interface);
     }
+    QTimer::singleShot(3000, managerInstance, [](){
+        for (auto interface : managerInstance->m_clients)
+            deleteClient(interface);
+        emit managerInstance->shutdownFinished();
+    });
 }
 
 LanguageClientManager *LanguageClientManager::instance()