From a01d3d5b4156e4826ae48f9a2acfcdd21dc764df Mon Sep 17 00:00:00 2001
From: Aleksander Nowakowski <a.f.nowakowski@gmail.com>
Date: Wed, 15 Mar 2017 12:32:35 +0100
Subject: [PATCH] Clearing the task queues on disconnection

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

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 a577ba57..9c382598 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,6 +1182,8 @@ 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();
+					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 6a461138..139b15a1 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,6 +611,8 @@ public class BleManager implements BleProfileApi {
 			} else {
 				if (newState == BluetoothProfile.STATE_DISCONNECTED) {
 					mOperationInProgress = true; // no more calls are possible
+					mInitQueue.clear();
+					mTaskQueue.clear();
 					if (mConnected) {
 						notifyDeviceDisconnected(gatt.getDevice());
 					}