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

ProjectExplorer: Fix shutting down unreachable remote processes

Browse Source 
We forgot to reset the state, which gave us a permanently broken run
control, preventing re-starting the application, among other things.

Change-Id: I7c168e31e015fdf7002c57aba0ed2178437a15ae
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Christian Kandeler
2023-12-11 13:47:57 +01:00
parent a374588604
commit f8cdcfd70c
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/projectexplorer/runcontrol.cpp
View File

@@ -1305,16 +1305,18 @@ void SimpleTargetRunnerPrivate::stop()
m_stopRequested = true;
q->appendMessage(Tr::tr("User requested stop. Shutting down..."), NormalMessageFormat);
switch (m_state) {
case Run:
m_process.stop();
if (!m_process.waitForFinished(2000)) { // TODO: it may freeze on some devices
QTC_CHECK(false); // Shouldn't happen, just emergency handling
m_process.close();
forwardDone();
}
break;
case Inactive:
break;
case Run:
m_process.stop();
if (!m_process.waitForFinished(2000)) { // TODO: it may freeze on some devices
q->appendMessage(Tr::tr("Remote process did not finish in time. "
"Connectivity lost?"), ErrorMessageFormat);
m_process.close();
m_state = Inactive;
forwardDone();
}
break;
case Inactive:
break;
}
}
}