summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Jan Mulder <jlmulder@xs4all.nl>2018-12-23 15:35:21 +0100
committerGravatar Jan Mulder <jlmulder@xs4all.nl>2018-12-23 21:43:57 +0100
commitffec5f4991f811d7f86f5e1f5622e21fb2b07951 (patch)
tree4fcb6a53b3b56434eb42b3fc6ba9ed84cdad0507
parent99d29a7838b9f0d9a55885924ba4a614e9cdc7ff (diff)
downloadsubsurface-ffec5f4991f811d7f86f5e1f5622e21fb2b07951.tar.gz
Bluetooth: all states other than HostPoweredOff qualify as valid
This is an attempt to fix issue #1896. While this seems a Qt issue in combination with very specific Android devices, this might be a fix. Do not check for a very specific state of the local BT controller, but just check if it is powered on. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
-rw-r--r--core/btdiscovery.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp
index 207dfacf8..b9ef687ac 100644
--- a/core/btdiscovery.cpp
+++ b/core/btdiscovery.cpp
@@ -102,10 +102,11 @@ BTDiscovery::BTDiscovery(QObject*) : m_btValid(false),
void BTDiscovery::BTDiscoveryReDiscover()
{
#if !defined(Q_OS_IOS)
+ qDebug() << "BTDiscoveryReDiscover: localBtDevice.isValid()" << localBtDevice.isValid();
if (localBtDevice.isValid() &&
- localBtDevice.hostMode() == QBluetoothLocalDevice::HostConnectable) {
+ localBtDevice.hostMode() != QBluetoothLocalDevice::HostPoweredOff) {
btPairedDevices.clear();
- qDebug() << "localDevice " + localBtDevice.name() + " is valid, starting discovery";
+ qDebug() << "BTDiscoveryReDiscover: localDevice " + localBtDevice.name() + " is powered on, starting discovery";
#else
// for iOS we can't use the localBtDevice as iOS is BLE only
// we need to find some other way to test if Bluetooth is enabled, though