summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Hartmann <aha_1980@gmx.de>2020-02-26 16:44:23 +0100
committerAndre Hartmann <aha_1980@gmx.de>2020-02-27 10:11:58 +0100
commit245f9f299a3503fa9acc54517fa9bd541366d7cc (patch)
tree2cdb03a5f1813250face7fb27edbe45c8e095012
parentab6f188bf00a9572804baa7b788536247ce88626 (diff)
Generic(V1): Fix emitting framesReceived when disconnected
When one of these plugins was used in the CAN-Example, the frames received slot was still called after disconnecting. That made the example stuck and emitting lots of "Cannot read frame as device is not connected." messages. This is mostly relevant for developers though, as these plugins are not deployed. Change-Id: I675518148f4bf37f11911dd7a0f6423ae18be19d Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
-rw-r--r--tests/auto/plugins/genericcanbus/dummybackend.cpp3
-rw-r--r--tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/plugins/genericcanbus/dummybackend.cpp b/tests/auto/plugins/genericcanbus/dummybackend.cpp
index 83d2480..301e738 100644
--- a/tests/auto/plugins/genericcanbus/dummybackend.cpp
+++ b/tests/auto/plugins/genericcanbus/dummybackend.cpp
@@ -52,17 +52,18 @@ DummyBackend::DummyBackend() :
enqueueReceivedFrames({dummyFrame});
});
- simulateReceivingTimer->start(1000);
}
bool DummyBackend::open()
{
+ simulateReceivingTimer->start(1000);
setState(QCanBusDevice::ConnectedState);
return true;
}
void DummyBackend::close()
{
+ simulateReceivingTimer->stop();
setState(QCanBusDevice::UnconnectedState);
}
diff --git a/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp b/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
index 4d7d9c0..99f7bcd 100644
--- a/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
+++ b/tests/auto/plugins/genericcanbusv1/dummybackendv1.cpp
@@ -52,17 +52,18 @@ DummyBackendV1::DummyBackendV1() :
enqueueReceivedFrames({dummyFrame});
});
- simulateReceivingTimer->start(1000);
}
bool DummyBackendV1::open()
{
+ simulateReceivingTimer->start(1000);
setState(QCanBusDevice::ConnectedState);
return true;
}
void DummyBackendV1::close()
{
+ simulateReceivingTimer->stop();
setState(QCanBusDevice::UnconnectedState);
}