diff options
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 2 | ||||
| -rw-r--r-- | src/serialport/qserialport_win.cpp | 12 | ||||
| -rw-r--r-- | src/serialport/qserialport_wince.cpp | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index eb71e86..c836eb2 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -382,7 +382,6 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs) Q_Q(QSerialPort); QElapsedTimer stopWatch; - stopWatch.start(); do { @@ -413,7 +412,6 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) return false; QElapsedTimer stopWatch; - stopWatch.start(); forever { diff --git a/src/serialport/qserialport_win.cpp b/src/serialport/qserialport_win.cpp index 64ca00e..a43e620 100644 --- a/src/serialport/qserialport_win.cpp +++ b/src/serialport/qserialport_win.cpp @@ -330,15 +330,15 @@ bool QSerialPortPrivate::waitForReadyRead(int msecs) { Q_Q(QSerialPort); - QElapsedTimer stopWatch; - stopWatch.start(); - if (!writeStarted && !_q_startAsyncWrite()) return false; const qint64 initialReadBufferSize = readBuffer.size(); qint64 currentReadBufferSize = initialReadBufferSize; + QElapsedTimer stopWatch; + stopWatch.start(); + do { bool timedOut = false; HANDLE triggeredEvent = 0; @@ -384,12 +384,12 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) if (writeBuffer.isEmpty()) return false; - QElapsedTimer stopWatch; - stopWatch.start(); - if (!writeStarted && !_q_startAsyncWrite()) return false; + QElapsedTimer stopWatch; + stopWatch.start(); + forever { bool timedOut = false; HANDLE triggeredEvent = 0; diff --git a/src/serialport/qserialport_wince.cpp b/src/serialport/qserialport_wince.cpp index a9c80b2..ee5d395 100644 --- a/src/serialport/qserialport_wince.cpp +++ b/src/serialport/qserialport_wince.cpp @@ -348,7 +348,6 @@ bool QSerialPortPrivate::waitForReadyRead(int msec) return true; QElapsedTimer stopWatch; - stopWatch.start(); forever { @@ -377,7 +376,6 @@ bool QSerialPortPrivate::waitForBytesWritten(int msec) return false; QElapsedTimer stopWatch; - stopWatch.start(); forever { |