From 60faa0f70b137c567769099292606b331f1a442e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Sep 2013 15:37:40 +0200 Subject: remove redundant condition ForwardedChannels implies that both stdoutReader and stderrReader are null. Change-Id: I9d5f02d3a1eac62316a6016b90c612d716ecaafc Reviewed-by: Lars Knoll --- src/corelib/io/qprocess_win.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/corelib/io/qprocess_win.cpp') 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) -- cgit v1.2.3