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

Fix up QProcess::waitForFinished()

Browse Source 
waitForFinish returns false if the process is no longer running at
the time of the call. Handle that throughout the codebase.

Change-Id: Ia7194095454e82efbd4eb88f2d55926bdd09e094
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-04-29 16:52:58 +02:00
parent 1a248b1b93
commit ddefe062c7
38 changed files with 374 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/projectexplorer/extracompiler.cpp
View File

@@ -463,7 +463,7 @@ void ProcessExtraCompiler::runInThread(
if (!isCanceled) {
handleProcessStarted(&process, sourceContents);
forever {
bool done = process.waitForFinished(200);
bool done = process.waitForFinished(200) || process.state() == QProcess::NotRunning;
isCanceled = futureInterface.isCanceled();
if (done || isCanceled)
break;
@@ -473,7 +473,7 @@ void ProcessExtraCompiler::runInThread(
isCanceled |= process.state() == QProcess::Running;
if (isCanceled) {
process.kill();
process.waitForFinished(3000);
process.waitForFinished();
return;
}