diff options
| author | Konstantin Shtepa <oss.konstantin.shtepa@yandex.ru> | 2017-02-26 23:22:13 +0700 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2017-03-30 06:20:47 +0000 |
| commit | 90be9fc65329509229eb17aef74e400fada58da9 (patch) | |
| tree | e96208b505f9cb65cad7182b99867714e02a4dda | |
| parent | daa73821d36591df8e975777f3f35d00395fcc94 (diff) | |
Fix QModbusRtuSerialMaster wouldn't close5.8
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
Reviewed-by: André Hartmann <aha_1980@gmx.de>
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 5567464..457372e 100644 --- a/src/serialbus/qmodbusrtuserialmaster.cpp +++ b/src/serialbus/qmodbusrtuserialmaster.cpp @@ -144,10 +144,8 @@ bool QModbusRtuSerialMaster::open() */ void QModbusRtuSerialMaster::close() { - if (state() == QModbusDevice::UnconnectedState || - state() == QModbusDevice::ClosingState) { + if (state() == QModbusDevice::UnconnectedState) return; - } setState(QModbusDevice::ClosingState); |