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

ProcessLauncherImpl: always send stop request to process launcher

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

Change-Id: I75051708d58ff645b9dbc632eb0b8d5cb557b7fa
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-07-09 17:02:01 +02:00
parent 2aa533c7dd
commit f8e0f6eb91
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/qtcprocess.cpp
View File

@@ -287,6 +287,7 @@ public:
connect(LauncherInterface::socket(), &LauncherSocket::packetArrived, connect(LauncherInterface::socket(), &LauncherSocket::packetArrived,
this, &ProcessLauncherImpl::handlePacket); this, &ProcessLauncherImpl::handlePacket);
} }
~ProcessLauncherImpl() override { cancel(); }
QByteArray readAllStandardOutput() override { return readAndClear(m_stdout); } QByteArray readAllStandardOutput() override { return readAndClear(m_stdout); }
QByteArray readAllStandardError() override { return readAndClear(m_stderr); } QByteArray readAllStandardError() override { return readAndClear(m_stderr); }
@@ -401,6 +402,8 @@ void ProcessLauncherImpl::doStart()
void ProcessLauncherImpl::cancel() void ProcessLauncherImpl::cancel()
{ {
if (m_canceled)
return;
switch (m_state) { switch (m_state) {
case QProcess::NotRunning: case QProcess::NotRunning:
break; break;