diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:18:59 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-28 16:18:59 +0200 |
| commit | cf2460238e923d2216e3664442e408dfb12d4a7f (patch) | |
| tree | 16ce81d3ac24da6f4aa4c53c8ce88fd95796de8a /src/serialport/qserialport_win.cpp | |
| parent | c6027a9c0e6182bde7106bc97b927c544e76e155 (diff) | |
| parent | 286d64c202f461cb8ff5a4cc4c2320af8195b8f0 (diff) | |
Merge remote-tracking branch 'origin/5.3' into 5.4v5.4.0-alpha1
Change-Id: Id742521c303261262a87db4189d369851ed2078b
Diffstat (limited to 'src/serialport/qserialport_win.cpp')
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 19f35b74..ecbf464a 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -327,6 +327,9 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs) QElapsedTimer stopWatch; stopWatch.start(); + if (!writeStarted && !startAsyncWrite()) + return false; + const qint64 initialReadBufferSize = readBuffer.size(); qint64 currentReadBufferSize = initialReadBufferSize; |