summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qprocess.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/io/qprocess.cpp')
-rw-r--r--src/corelib/io/qprocess.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 1583f31e34..fb769ef74c 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -1783,7 +1783,15 @@ bool QProcess::waitForReadyRead(int msecs)
return false;
if (d->currentReadChannel == QProcess::StandardError && d->stderrChannel.closed)
return false;
- return d->waitForReadyRead(QDeadlineTimer(msecs));
+
+ QDeadlineTimer deadline(msecs);
+ if (d->processState == QProcess::Starting) {
+ bool started = d->waitForStarted(deadline);
+ if (!started)
+ return false;
+ }
+
+ return d->waitForReadyRead(deadline);
}
/*! \reimp