diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-09-03 15:37:40 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-05 11:18:59 +0200 |
| commit | 60faa0f70b137c567769099292606b331f1a442e (patch) | |
| tree | 74c94b7017029f9c2c68478e58271ca058782ea1 /src/corelib/io/qprocess_win.cpp | |
| parent | 0cf79e47dacb6439b378aca71d90ce4bbb45795b (diff) | |
remove redundant condition
ForwardedChannels implies that both stdoutReader and stderrReader are null.
Change-Id: I9d5f02d3a1eac62316a6016b90c612d716ecaafc
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/corelib/io/qprocess_win.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_win.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp index f16025752e..49c699d6cc 100644 --- a/src/corelib/io/qprocess_win.cpp +++ b/src/corelib/io/qprocess_win.cpp @@ -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) |