diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 15:26:34 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-13 15:40:41 +0200 |
| commit | def2f0f007b160c0ca135786bcf73f2e6dc45fd6 (patch) | |
| tree | cdff594f0c6767d520ca715b9ac9fa4546b6f433 | |
| parent | f770a90b011a2aaf978dfa75870cc462fae44fa0 (diff) | |
| parent | d30165e57bef38fe83138e9c812c952e510841e8 (diff) | |
| download | qtserialport-def2f0f007b160c0ca135786bcf73f2e6dc45fd6.tar.gz | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
| -rw-r--r-- | src/serialport/qserialport_unix.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/serialport/qserialport_unix.cpp b/src/serialport/qserialport_unix.cpp index 4f9ca19..04bb6a8 100644 --- a/src/serialport/qserialport_unix.cpp +++ b/src/serialport/qserialport_unix.cpp @@ -525,12 +525,11 @@ bool QSerialPortPrivate::waitForBytesWritten(int msecs) bool QSerialPortPrivate::setBaudRate() { - if (!setBaudRate(inputBaudRate, QSerialPort::Input) - && !setBaudRate(outputBaudRate, QSerialPort::Output)) { - return false; - } + if (inputBaudRate == outputBaudRate) + return setBaudRate(inputBaudRate, QSerialPort::AllDirections); - return true; + return (setBaudRate(inputBaudRate, QSerialPort::Input) + && setBaudRate(outputBaudRate, QSerialPort::Output)); } bool QSerialPortPrivate::setBaudRate(qint32 baudRate, QSerialPort::Directions directions) |