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

ProjectExplorer: If a worker fails while we're stopping, continue

Browse Source 
We don't need to re-initiate the stopping.

Change-Id: I2c19dca854c93e0340227d08a381c3bde919363d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Ulf Hermann
2017-08-09 13:44:00 +02:00
parent 8507f6ae55
commit a62f882c42
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -919,7 +919,10 @@ void RunControlPrivate::onWorkerFailed(RunWorker *worker, const QString &msg)
worker->d->state = RunWorkerState::Done; worker->d->state = RunWorkerState::Done;
showError(msg); showError(msg);
if (state == RunControlState::Running || state == RunControlState::Starting)
initiateStop(); initiateStop();
else
continueStopOrFinish();
} }
void RunControlPrivate::onWorkerStopped(RunWorker *worker) void RunControlPrivate::onWorkerStopped(RunWorker *worker)