diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-08 18:32:01 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-08 18:32:01 +0200 |
| commit | d30165e57bef38fe83138e9c812c952e510841e8 (patch) | |
| tree | f4e721816511a8007009b083bafe69dd4f15c2f9 | |
| parent | c0fc9aecd67323630011eaa9a1c213eed5bc5387 (diff) | |
| parent | 684945503a444dfc3a0fd475b7f8d81bc48a387a (diff) | |
| download | qtserialport-d30165e57bef38fe83138e9c812c952e510841e8.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I26db36a638685472296001d9982a157b8a6616b5
| -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) |