From f354d93ec78694226505b933eeedf56eaef1305b Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 26 Apr 2010 13:38:49 +0200
Subject: [PATCH] Emit processStopped() for ConsoleProcess on
ConsoleProcess::stop()
Task-Nr: QTCREATORBUG-1234
Reviewed-By: ossi
---
src/plugins/projectexplorer/applicationlauncher_win.cpp | 3 +++
src/plugins/projectexplorer/applicationlauncher_x11.cpp | 3 +++
2 files changed, 6 insertions(+)
diff --git a/src/plugins/projectexplorer/applicationlauncher_win.cpp b/src/plugins/projectexplorer/applicationlauncher_win.cpp
index cd082128930..bb35f7c2420 100644
--- a/src/plugins/projectexplorer/applicationlauncher_win.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_win.cpp
@@ -82,10 +82,13 @@ void ApplicationLauncher::start(Mode mode, const QString &program, const QString
void ApplicationLauncher::stop()
{
+ if (!isRunning())
+ return;
if (m_currentMode == Gui) {
m_winGuiProcess->stop();
} else {
m_consoleProcess->stop();
+ processStopped();
}
}
diff --git a/src/plugins/projectexplorer/applicationlauncher_x11.cpp b/src/plugins/projectexplorer/applicationlauncher_x11.cpp
index cf15d0c3b2c..12a3a5ea541 100644
--- a/src/plugins/projectexplorer/applicationlauncher_x11.cpp
+++ b/src/plugins/projectexplorer/applicationlauncher_x11.cpp
@@ -87,6 +87,8 @@ void ApplicationLauncher::start(Mode mode, const QString &program, const QString
void ApplicationLauncher::stop()
{
+ if (!isRunning())
+ return;
if (m_currentMode == Gui) {
m_guiProcess->terminate();
if (!m_guiProcess->waitForFinished(1000)) { // This is blocking, so be fast.
@@ -95,6 +97,7 @@ void ApplicationLauncher::stop()
}
} else {
m_consoleProcess->stop();
+ processStopped();
}
}
--
GitLab