diff options
| author |   Matt Ranostay <matt.ranostay@konsulko.com> | 2019-04-02 20:05:26 -0700 |
|---|---|---|
| committer | Matt Ranostay <matt.ranostay@konsulko.com> | 2019-04-04 12:41:49 -0700 |
| commit | 9853b85a2e1772c250af222069ef31d32bca2964 (patch) | |
| tree | 69730b8e842b8e3a6e4b66892ceec6d55f4e5370 | |
| parent | a4138d46829dd96017b1af77ef42793f44b5b8d4 (diff) | |
settings: bluetooth: qml: cleanup onPoweredChanged slotguppy_7.0.1guppy/7.0.17.0.1
Move enabling of discovery + discoverablity to the respective slot
to avoid race conditions from the adapter powering on
Bug-AGL: SPEC-2295 SPEC-2290
Change-Id: I16c04d7bcd880ef5dcc5352d0da52ce2fe8b2447
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
| -rw-r--r-- | app/bluetooth/Bluetooth.qml | 16 |
1 files 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 { |