diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-08-09 13:44:00 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-08-09 11:55:07 +0000 |
| commit | a62f882c421d1b50c231cb6a30857ac5b5f4054a (patch) | |
| tree | 7375c2ea3aeb47769979926b7546cd915b805359 | |
| parent | 8507f6ae55c9cd6f882435d7944eedc1fe12edf4 (diff) | |
ProjectExplorer: If a worker fails while we're stopping, continue
We don't need to re-initiate the stopping.
Change-Id: I2c19dca854c93e0340227d08a381c3bde919363d
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/projectexplorer/runconfiguration.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index c38f50672ad..2c26207c83e 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -919,7 +919,10 @@ void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg) worker->d->state = RunWorkerState::Done; showError(msg); - initiateStop(); + if (state == RunControlState::Running || state == RunControlState::Starting) + initiateStop(); + else + continueStopOrFinish(); } void RunControlPrivate::onWorkerStopped(RunWorker *worker) |