From 7c6b81517e52a25eb1c30f1c1d5b5b220c421cd7 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Fri, 10 Aug 2012 02:09:32 -0500
Subject: [PATCH] AndroidGCS: Somehow multiple disconnects were triggered.

---
 .../androidgcs/telemetry/OPTelemetryService.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java b/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
index 502814731..9f8869ca5 100644
--- a/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
+++ b/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
@@ -128,14 +128,15 @@ public class OPTelemetryService extends Service {
 			case MSG_DISCONNECT:
 				Toast.makeText(getApplicationContext(), "Disconnect requested", Toast.LENGTH_SHORT).show();
 				terminate = true;
-				activeTelem.interrupt();
-				try {
-					activeTelem.join();
-				} catch (InterruptedException e) {
-					e.printStackTrace();
+				if (activeTelem != null) {
+					activeTelem.interrupt();
+					try {
+						activeTelem.join();
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+					}
+					activeTelem = null;
 				}
-				activeTelem = null;
-
 				Intent intent = new Intent();
 				intent.setAction(INTENT_ACTION_DISCONNECTED);
 				sendBroadcast(intent,null);