whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove redundant condition 

ForwardedChannels implies that both stdoutReader and stderrReader are null.

Change-Id: I9d5f02d3a1eac62316a6016b90c612d716ecaafc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
bb10
Oswald Buddenhagen 2013-09-03 15:37:40 +02:00 committed by The Qt Project
parent 0cf79e47da
commit 60faa0f70b
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,9 +663,8 @@ bool QProcessPrivate::waitForReadyRead(int msecs)
if (pipeWriter && pipeWriter->waitForWrite(0))
timer.resetIncrements();
if (processChannelMode != QProcess::ForwardedChannels
&& ((stdoutReader && stdoutReader->waitForReadyRead(0))
|| (stderrReader && stderrReader->waitForReadyRead(0))))
if ((stdoutReader && stdoutReader->waitForReadyRead(0))
|| (stderrReader && stderrReader->waitForReadyRead(0)))
return true;
if (!pid)