diff options
| author | Konstantin Shtepa <oss.konstantin.shtepa@yandex.ru> | 2017-02-26 23:22:13 +0700 |
|---|---|---|
| committer | André Hartmann <aha_1980@gmx.de> | 2017-05-29 13:18:41 +0000 |
| commit | f5b1c3a32b2a7c9bc06b68c469981ae46fb7172e (patch) | |
| tree | 45d7871fd5c10f77409058d3b33a97bebed75bb6 | |
| parent | 0c60b2c10bd30e1ccb775a3fb406ba1e8214b1c3 (diff) | |
Fix QModbusRtuSerialMaster wouldn't close
QModbusRtuSerialMaster wouldn't close on disconnect and would never
release serial port because of patch in QTBUG-56009. Revert part of
patch 6bed30d5ceef1463469e37173b3ebac2cfdc2352 which lead to this
state.
Task-number: QTBUG-59050
Change-Id: I8b3280a2889a416aa80e7f58264b5f9696b8c8b9
(cherry picked from commit 90be9fc65329509229eb17aef74e400fada58da9)
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | src/serialbus/qmodbusrtuserialmaster.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/serialbus/qmodbusrtuserialmaster.cpp b/src/serialbus/qmodbusrtuserialmaster.cpp index 95ab5eb..216fd3b 100644 --- a/src/serialbus/qmodbusrtuserialmaster.cpp +++ b/src/serialbus/qmodbusrtuserialmaster.cpp @@ -112,10 +112,8 @@ bool QModbusRtuSerialMaster::open() */ void QModbusRtuSerialMaster::close() { - if (state() == QModbusDevice::UnconnectedState || - state() == QModbusDevice::ClosingState) { + if (state() == QModbusDevice::UnconnectedState) return; - } setState(QModbusDevice::ClosingState); |