From e1e25b0d97ab9eafaa63f76af22dc0d565724138 Mon Sep 17 00:00:00 2001 From: Matt Ranostay Date: Tue, 2 Apr 2019 20:05:26 -0700 Subject: settings: bluetooth: qml: cleanup onPoweredChanged slot Move enabling of discovery + discoverablity to the respective slot to avoid race conditions from the adapter powering on Bug-AGL: SPEC-2295 Change-Id: I16c04d7bcd880ef5dcc5352d0da52ce2fe8b2447 Signed-off-by: Matt Ranostay --- app/bluetooth/Bluetooth.qml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/bluetooth/Bluetooth.qml b/app/bluetooth/Bluetooth.qml index efc2374..b2b3308 100644 --- a/app/bluetooth/Bluetooth.qml +++ b/app/bluetooth/Bluetooth.qml @@ -33,7 +33,14 @@ SettingPage { bluetooth.send_confirmation(data.pincode) } - onPowerChanged: if (!root.checked) root.checked = state + onPowerChanged: { + if (state) { + bluetooth.start_discovery() + bluetooth.discoverable = true; + } + root.checked = state + } + } Text { @@ -46,12 +53,7 @@ SettingPage { onCheckedChanged: { console.log("Bluetooth set to", checked) - - bluetooth.power = checked; - bluetooth.discoverable = checked; - - if (checked == true) - bluetooth.start_discovery() + bluetooth.power = checked } Rectangle { -- cgit 1.2.3-korg