From 409f9573bd33a8fa88af0f7f89eecf29063e8e1a Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Thu, 16 Mar 2017 12:43:40 +0100
Subject: [PATCH] Clearing task queues fixed

---
 .../no/nordicsemi/android/nrftoolbox/profile/BleManager.java    | 2 +-
 .../java/no/nordicsemi/android/nrftoolbox/ble/BleManager.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
index 9c382598..81c1a8da 100644
--- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
+++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleManager.java
@@ -1182,7 +1182,7 @@ public abstract class BleManager<E extends BleManagerCallbacks> implements ILogg
 						Logger.w(mLogSession, "Error: (0x" + Integer.toHexString(status) + "): " + GattError.parseConnectionError(status));
 
 					mOperationInProgress = true; // no more calls are possible
-					mInitQueue.clear();
+					mInitQueue = null;
 					mTaskQueue.clear();
 					if (mConnected) {
 						notifyDeviceDisconnected(gatt.getDevice());
diff --git a/wear/src/main/java/no/nordicsemi/android/nrftoolbox/ble/BleManager.java b/wear/src/main/java/no/nordicsemi/android/nrftoolbox/ble/BleManager.java
index 139b15a1..4efa11aa 100644
--- a/wear/src/main/java/no/nordicsemi/android/nrftoolbox/ble/BleManager.java
+++ b/wear/src/main/java/no/nordicsemi/android/nrftoolbox/ble/BleManager.java
@@ -611,7 +611,7 @@ public class BleManager implements BleProfileApi {
 			} else {
 				if (newState == BluetoothProfile.STATE_DISCONNECTED) {
 					mOperationInProgress = true; // no more calls are possible
-					mInitQueue.clear();
+					mInitQueue = null;
 					mTaskQueue.clear();
 					if (mConnected) {
 						notifyDeviceDisconnected(gatt.getDevice());