diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-06 03:00:36 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-06 03:00:36 +0100 |
| commit | 4eb1ba5918e5e8e70a1f7ba9e731d2572f37d340 (patch) | |
| tree | 9750b985b107e190ece15b6e09aeab29bae0cdb8 | |
| parent | af67afbfded9aa63fa8c9997274ed61c198a9062 (diff) | |
| parent | ea1a95d3567f1264126bf34218a5532ffb5afc51 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0727645adb5ce90084de230ecf03af80854aaeb4
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index a13a2890..dd0339fd 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -526,7 +526,8 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) for (;;) { bool readyToRead = false; bool readyToWrite = false; - if (!waitForReadOrWrite(&readyToRead, &readyToWrite, true, !writeBuffer.isEmpty(), + const bool checkRead = q_func()->isReadable(); + if (!waitForReadOrWrite(&readyToRead, &readyToWrite, checkRead, !writeBuffer.isEmpty(), qt_subtract_from_timeout(msecs, stopWatch.elapsed()))) { return false; } |