Skip to content

Commit c0bec9e

Browse files
committed
Merge remote-tracking branch 'origin/dev'
2 parents 3a6385d + 0342da2 commit c0bec9e

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ Run the installer:
127127
### Install
128128
Install the DEB package from the command line:
129129
```bash
130-
sudo apt install -f ./qt6-omodscan_1.12.0-1_amd64.deb
130+
sudo apt install ./qt6-omodscan_1.12.0-1_amd64.deb
131131
```
132132
or if you want to use Qt5 libraries:
133133
```bash
134-
sudo apt install -f ./qt5-omodscan_1.12.0-1_amd64.deb
134+
sudo apt install ./qt5-omodscan_1.12.0-1_amd64.deb
135135
```
136136

137137
### Remove

omodscan/modbusrtuscanner.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void ModbusRtuScanner::sendRequest(int deviceId)
142142

143143
if(error == QModbusDevice::TimeoutError)
144144
sendRequest(deviceId + 1);
145-
else
145+
else if(inProgress())
146146
QTimer::singleShot(_params.Timeout, [this, deviceId] { sendRequest(deviceId + 1); });
147147
},
148148
Qt::QueuedConnection);

0 commit comments

Comments
 (0)