diff options
| author | Alex Trotsenko <alex1973tr@gmail.com> | 2017-04-21 19:31:58 +0300 |
|---|---|---|
| committer | Alex Trotsenko <alex1973tr@gmail.com> | 2017-04-22 16:05:46 +0000 |
| commit | e5dfb098638628b0215e11791bce372a656af390 (patch) | |
| tree | f448e5e515320c5c0875447d76b7baae4146fac9 | |
| parent | d320f01018f0273e4fea2e0a7aa8f30ee8129587 (diff) | |
| download | qtserialport-e5dfb098638628b0215e11791bce372a656af390.tar.gz | |
Fix bytesToWrite()
We should not add the size of the internal write buffer here because
QIODevice::bytesToWrite() already checks it. Also, take into account
the size of 'writeChunkBuffer' on Windows.
Change-Id: I87dfcb4dd1cd9d2bbb6f82a084d79fb4db9323d8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/serialport/qserialport.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/serialport/qserialport.cpp b/src/serialport/qserialport.cpp index 8140deb..5534bb8 100644 --- a/src/serialport/qserialport.cpp +++ b/src/serialport/qserialport.cpp @@ -1283,8 +1283,11 @@ qint64 QSerialPort::bytesAvailable() const */ qint64 QSerialPort::bytesToWrite() const { - Q_D(const QSerialPort); - return QIODevice::bytesToWrite() + d->writeBuffer.size(); + qint64 pendingBytes = QIODevice::bytesToWrite(); +#if defined(Q_OS_WIN32) + pendingBytes += d_func()->writeChunkBuffer.size(); +#endif + return pendingBytes; } /*! |