From 02a4f74cfefd97d88b0b1354be176a4329336004 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@digia.com>
Date: Wed, 15 Jan 2014 15:08:52 +0100
Subject: Emit PoweredOffError if required during device discovery start on
 Bluez

Change-Id: I12406b2a0fef831ed2e96340fac73156dfa71848
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
---
 src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp')

diff --git a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
index 805f648a..cce27dc5 100644
--- a/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
+++ b/src/bluetooth/qbluetoothdevicediscoveryagent_bluez.cpp
@@ -118,6 +118,18 @@ void QBluetoothDeviceDiscoveryAgentPrivate::start()
         qCDebug(QT_BT_BLUEZ) << Q_FUNC_INFO << "ERROR: " << errorString;
         lastError = QBluetoothDeviceDiscoveryAgent::InputOutputError;
         Q_Q(QBluetoothDeviceDiscoveryAgent);
+        delete adapter;
+        adapter = 0;
+        emit q->error(lastError);
+        return;
+    }
+
+    if (!propertiesReply.value().value(QStringLiteral("Powered")).toBool()) {
+        qCDebug(QT_BT_BLUEZ) << "Aborting device discovery due to offline Bluetooth Adapter";
+        lastError = QBluetoothDeviceDiscoveryAgent::PoweredOffError;
+        errorString = QBluetoothDeviceDiscoveryAgent::tr("Device is powered off.");
+        delete adapter;
+        adapter = 0;
         emit q->error(lastError);
         return;
     }
-- 
cgit v1.2.3