From: Mike Beattie <mike@ethernal.org>
Date: Tue, 28 Aug 2012 09:54:05 +0000 (+1200)
Subject: altosdroid: fix double call of stopAltosBluetooth()
X-Git-Tag: 1.1~47^2~13
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c7bef83fd553987f83c0bf7ff37ef941872564fe

altosdroid: fix double call of stopAltosBluetooth()

Signed-off-by: Mike Beattie <mike@ethernal.org>
---

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index ccb04de0..10c2e26f 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -110,8 +110,11 @@ public class TelemetryService extends Service {
 				s.startAltosBluetooth();
 				break;
 			case MSG_DISCONNECTED:
-				if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
-				s.stopAltosBluetooth();
+				// Only do the following if we haven't been shutdown elsewhere..
+				if (s.device != null) {
+					if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
+					s.stopAltosBluetooth();
+				}
 				break;
 			case MSG_TELEMETRY:
 				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_TELEMETRY, msg.obj));