From be4bd1dc06444dc44072ac3812a63dc02dab54e5 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 13 Dec 2018 12:33:20 +0100 Subject: [PATCH] RemoteLinux: Do not try to kill a non-existing process After sending SIGTERM, check whether the process is still running before sending SIGKILL. Fixes: QTCREATORBUG-19941 Change-Id: I16953fbe1690373990f8a8fe723572b2125b59d3 Reviewed-by: hjk --- src/plugins/remotelinux/remotelinuxsignaloperation.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp index 07e5e1d04e2..64e1f5b2d3b 100644 --- a/src/plugins/remotelinux/remotelinuxsignaloperation.cpp +++ b/src/plugins/remotelinux/remotelinuxsignaloperation.cpp @@ -94,8 +94,10 @@ QString RemoteLinuxSignalOperation::interruptProcessByNameCommandLine(const QStr void RemoteLinuxSignalOperation::killProcess(qint64 pid) { - run(QString::fromLatin1("%1; sleep 1; %2").arg(signalProcessGroupByPidCommandLine(pid, 15), - signalProcessGroupByPidCommandLine(pid, 9))); + run(QString::fromLatin1("%1; sleep 1; %2 && %3") + .arg(signalProcessGroupByPidCommandLine(pid, 15), + signalProcessGroupByPidCommandLine(pid, 0), + signalProcessGroupByPidCommandLine(pid, 9))); } void RemoteLinuxSignalOperation::killProcess(const QString &filePath)