From 6b9b49734ec5ece501b3ccc4ff26709a11b1b028 Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Fri, 10 Aug 2012 10:14:25 -0500
Subject: [PATCH] Check there is an active telemetry before trying to
 disconnect it

---
 .../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 58bfc8918..2e518b7e0 100644
--- a/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
+++ b/androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
@@ -140,14 +140,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);