summaryrefslogtreecommitdiffstats
path: root/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
diff options
context:
space:
mode:
authorSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-13 09:28:21 +0200
committerSami Nurmenniemi <sami.nurmenniemi@qt.io>2017-11-22 10:42:26 +0000
commit9c9281bb05f785451d276f0d3145029ab6fb8a2f (patch)
treea50888ca629a00ab9e4eb42c400b86ac4de172b5 /src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
parent219777455e401139d522c6129c90b7a91588d397 (diff)
Fix bluetooth settings
- Hide "Scanning" text if bluetooth is powered off during scanning - Don't create duplicate entries of devices when scanning again - List devices in alphabetically sorted order - Don't initiate new scan if it's already going on Task-number: QTBUG-60084 Change-Id: I009d66694e3bcfe7419a5f5e01bfd253d7aa4cc8 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
Diffstat (limited to 'src/bluetoothsettings/bluez/bluetoothdevice_p.cpp')
-rw-r--r--src/bluetoothsettings/bluez/bluetoothdevice_p.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
index 4440277..48e6695 100644
--- a/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
+++ b/src/bluetoothsettings/bluez/bluetoothdevice_p.cpp
@@ -227,9 +227,11 @@ void BluetoothDevicePrivate::getManagedObjectsFinished(QDBusPendingCallWatcher *
if (m_powered) {
emit q->poweredChanged();
- m_deviceModel->scanDevices();
- m_scanning = true;
- emit q->scanningChanged();
+ if (!m_scanning) {
+ m_deviceModel->scanDevices();
+ m_scanning = true;
+ emit q->scanningChanged();
+ }
}
emit q->availabilityChanged();