feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

RemoteLinux: Do not try to kill a non-existing process

Browse Source 
After sending SIGTERM, check whether the process is still running before
sending SIGKILL.

Fixes: QTCREATORBUG-19941
Change-Id: I16953fbe1690373990f8a8fe723572b2125b59d3
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2018-12-13 12:33:20 +01:00
parent d7178b88c4
commit be4bd1dc06
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/remotelinux/remotelinuxsignaloperation.cpp
View File

@@ -94,7 +94,9 @@ QString RemoteLinuxSignalOperation::interruptProcessByNameCommandLine(const QStr
void RemoteLinuxSignalOperation::killProcess(qint64 pid) void RemoteLinuxSignalOperation::killProcess(qint64 pid)
{ {
run(QString::fromLatin1("%1; sleep 1; %2").arg(signalProcessGroupByPidCommandLine(pid, 15), run(QString::fromLatin1("%1; sleep 1; %2 && %3")
.arg(signalProcessGroupByPidCommandLine(pid, 15),
signalProcessGroupByPidCommandLine(pid, 0),
signalProcessGroupByPidCommandLine(pid, 9))); signalProcessGroupByPidCommandLine(pid, 9)));
} }