diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:04:12 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-13 03:04:12 +0200 |
commit | fe80eef6b3377c8727c5190d275808c343ee7c75 (patch) | |
tree | c72a9d4bf644e161bab7da4234ccce942d9f1e26 /src/plugins/canbus | |
parent | 3df07ae0b98dabbc2b60bab162173b24b010a4ee (diff) | |
parent | fc5e6011c1af70bd47a77796a0d0ab0fcd186541 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3
Change-Id: I345178003443aabe5c60c31b091d105f4639914a
Diffstat (limited to 'src/plugins/canbus')
-rw-r--r-- | src/plugins/canbus/systeccan/systeccanbackend.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/canbus/systeccan/systeccanbackend.cpp b/src/plugins/canbus/systeccan/systeccanbackend.cpp index f33d9ba..3fdd135 100644 --- a/src/plugins/canbus/systeccan/systeccanbackend.cpp +++ b/src/plugins/canbus/systeccan/systeccanbackend.cpp @@ -479,11 +479,11 @@ bool SystecCanBackend::open() if (!d->open()) return false; - // Apply all stored configurations except bitrate, because - // the bitrate can not be applied after opening the device + // Apply all stored configurations except bitrate and receive own, + // because these cannot be applied after opening the device const QVector<int> keys = configurationKeys(); for (int key : keys) { - if (key == QCanBusDevice::BitRateKey) + if (key == BitRateKey || key == ReceiveOwnKey) continue; const QVariant param = configurationParameter(key); const bool success = d->setConfigurationParameter(key, param); |