From f8e0f6eb915780ea22b6b94128cb10e84a5f3aa7 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Fri, 9 Jul 2021 17:02:01 +0200
Subject: [PATCH] ProcessLauncherImpl: always send stop request to process
 launcher

In this way we may cleanup it properly inside process launcher.

Change-Id: I75051708d58ff645b9dbc632eb0b8d5cb557b7fa
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/utils/qtcprocess.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libs/utils/qtcprocess.cpp b/src/libs/utils/qtcprocess.cpp
index 6552ad9167c..7b5076bec36 100644
--- a/src/libs/utils/qtcprocess.cpp
+++ b/src/libs/utils/qtcprocess.cpp
@@ -287,6 +287,7 @@ public:
         connect(LauncherInterface::socket(), &LauncherSocket::packetArrived,
                 this, &ProcessLauncherImpl::handlePacket);
     }
+    ~ProcessLauncherImpl() override { cancel(); }
 
     QByteArray readAllStandardOutput() override { return readAndClear(m_stdout); }
     QByteArray readAllStandardError() override { return readAndClear(m_stderr); }
@@ -401,6 +402,8 @@ void ProcessLauncherImpl::doStart()
 
 void ProcessLauncherImpl::cancel()
 {
+    if (m_canceled)
+        return;
     switch (m_state) {
     case QProcess::NotRunning:
         break;