From 9b44c6ea4f2502931835fd84fec3af827616c85b Mon Sep 17 00:00:00 2001
From: Vikas Pachdha <vikas.pachdha@qt.io>
Date: Tue, 9 May 2017 09:02:12 +0200
Subject: [PATCH] iOS: Stop ios-tool gracefully before killing

Task-number: QTCREATORBUG-18147
Change-Id: Ic6b4c179fca5f51f5052dcffffefd1079a686233
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/ios/iostoolhandler.cpp | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp
index 4795d922a0c..895397ffbe9 100644
--- a/src/plugins/ios/iostoolhandler.cpp
+++ b/src/plugins/ios/iostoolhandler.cpp
@@ -248,6 +248,7 @@ class IosDeviceToolHandlerPrivate : public IosToolHandlerPrivate
 {
 public:
     explicit IosDeviceToolHandlerPrivate(const IosDeviceType &devType, IosToolHandler *q);
+    ~IosDeviceToolHandlerPrivate();
 
 // IosToolHandlerPrivate overrides
 public:
@@ -656,8 +657,11 @@ IosDeviceToolHandlerPrivate::IosDeviceToolHandlerPrivate(const IosDeviceType &de
     : IosToolHandlerPrivate(devType, q)
 {
     auto deleter = [](QProcess *p) {
-        p->kill();
-        p->waitForFinished(10000);
+        if (p->state() != QProcess::NotRunning) {
+            p->kill();
+            if (!p->waitForFinished(2000))
+                p->terminate();
+        }
         delete p;
     };
     process = std::shared_ptr<QProcess>(new QProcess, deleter);
@@ -696,6 +700,20 @@ IosDeviceToolHandlerPrivate::IosDeviceToolHandlerPrivate(const IosDeviceType &de
     QObject::connect(&killTimer, &QTimer::timeout, std::bind(&IosDeviceToolHandlerPrivate::killProcess, this));
 }
 
+IosDeviceToolHandlerPrivate::~IosDeviceToolHandlerPrivate()
+{
+    if (isRunning()) {
+        // Disconnect the signals to avoid notifications while destructing.
+        // QTCREATORBUG-18147
+        process->disconnect();
+        // Quit ios-tool gracefully before kill is executed.
+        process->write("k\n\r");
+        process->closeWriteChannel();
+        // Give some time to ios-tool to finish.
+        process->waitForFinished(2000);
+    }
+}
+
 void IosDeviceToolHandlerPrivate::requestTransferApp(const QString &bundlePath,
                                                      const QString &deviceId, int timeout)
 {