From 26878aacaadaa094e78f36ffcbeb09d30273b44a Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Mon, 23 Jan 2017 15:05:43 +0100
Subject: [PATCH] CMake: Cancel running tasks on crash of cmake server

Change-Id: I5bf36a5ebb9d6a80278b9b83a14788a171f9c14f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 src/plugins/cmakeprojectmanager/servermodereader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index 81985a69763..dcb12eba0f1 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -103,7 +103,10 @@ void ServerModeReader::setParameters(const BuildDirReader::Parameters &p)
         connect(m_cmakeServer.get(), &ServerMode::connected,
                 this, &ServerModeReader::isReadyNow, Qt::QueuedConnection); // Delay
         connect(m_cmakeServer.get(), &ServerMode::disconnected,
-                this, [this]() { m_cmakeServer.reset(); }, Qt::QueuedConnection); // Delay
+                this, [this]() {
+            stop();
+            m_cmakeServer.reset();
+        }, Qt::QueuedConnection); // Delay
     }
 }