From 2f9bf92a1792cc99afa03190d05d833280ccd881 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 23 Jan 2019 14:28:56 +1300 Subject: [PATCH] Bluetooth: don't crash if BT is turned off At least on a Mac we can get here without a discoveryAgent if BT is off, so don't derefence the NULL pointer in that case. Signed-off-by: Dirk Hohndel --- core/btdiscovery.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/btdiscovery.cpp b/core/btdiscovery.cpp index b9ef687ac..578264b48 100644 --- a/core/btdiscovery.cpp +++ b/core/btdiscovery.cpp @@ -316,6 +316,12 @@ bool BTDiscovery::checkException(const char* method, const QAndroidJniObject *ob void BTDiscovery::discoverAddress(QString address) { + // if we have a discovery agent, check if we know about the address and if not + // make sure we are looking for it + // (if we don't have a discoveryAgent then likely BT is off or something else went wrong) + if (!discoveryAgent) + return; + // let's make sure there is no device name mixed in with the address QString btAddress; btAddress = extractBluetoothAddress(address);