1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove useless call in QProcessPrivate::waitForFinished() on Windows

Browse Source 
if pid == nullptr, the child process has already exited and the pipe
readers have been stopped. So the call to drainOutputPipes() is
unnecessary here.

Change-Id: I0bed90d08ac879bb0ae178a1cdc37afb9d825314
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
This commit is contained in:
Alex Trotsenko 2021-01-08 17:27:12 +02:00
parent db5c901594
commit 4ff41e6ff8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qprocess_win.cpp
View File

@ -776,10 +776,8 @@ bool QProcessPrivate::waitForFinished(const QDeadlineTimer &deadline)
if (stderrChannel.reader && stderrChannel.reader->waitForReadyRead(0)) if (stderrChannel.reader && stderrChannel.reader->waitForReadyRead(0))
timer.resetIncrements(); timer.resetIncrements();
if (!pid) { if (!pid)
drainOutputPipes();
return true; return true;
}
if (WaitForSingleObject(pid->hProcess, timer.nextSleepTime()) == WAIT_OBJECT_0) { if (WaitForSingleObject(pid->hProcess, timer.nextSleepTime()) == WAIT_OBJECT_0) {
drainOutputPipes(); drainOutputPipes();