diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-20 03:00:52 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-20 03:00:52 +0100 |
| commit | 9facaa7107835394d82fee41229f26610dee889e (patch) | |
| tree | 26590ffdc03fb8b7ef7e63a727d2ec2fbc557d00 /src/plugins/canbus | |
| parent | e0e89f0719497d43fcbd14a2c8d17bcaaf595a78 (diff) | |
| parent | 20cbe35dc3282b8e27278e3bd54d415cc8147d3c (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I02db5c1b8c8445ec96c79cc26bdf4fbb84720d5e
Diffstat (limited to 'src/plugins/canbus')
| -rw-r--r-- | src/plugins/canbus/vectorcan/vectorcanbackend.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp index dc28d7c..9026888 100644 --- a/src/plugins/canbus/vectorcan/vectorcanbackend.cpp +++ b/src/plugins/canbus/vectorcan/vectorcanbackend.cpp @@ -355,7 +355,7 @@ void VectorCanBackendPrivate::startRead() break; } - if (event.tag != XL_RECEIVE_MSG || event.portHandle != portHandle) + if (event.tag != XL_RECEIVE_MSG) continue; const s_xl_can_msg &msg = event.tagData.msg; |