summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-09 03:02:43 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-09 03:02:43 +0100
commitb6f4d00b1ed8942df0832bb179de2ea331fc6755 (patch)
tree05a40e3e9a812e614c4812b4f55722385a222d92
parentcc615e02420769e61993e6183897087992a47d6c (diff)
parent3f9ba9c07322d90f8f918d9e144e84d422e4cfbd (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1
-rw-r--r--src/bluetooth/qlowenergycontroller_bluezdbus.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
index 441eca6b..f019d9c2 100644
--- a/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
+++ b/src/bluetooth/qlowenergycontroller_bluezdbus.cpp
@@ -350,6 +350,9 @@ void QLowEnergyControllerPrivateBluezDBus::connectToDevice()
void QLowEnergyControllerPrivateBluezDBus::disconnectFromDevice()
{
+ if (!device)
+ return;
+
setState(QLowEnergyController::ClosingState);
QDBusPendingReply<> reply = device->Disconnect();