X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=f1304a95298f3d645e10eb13419e90ba9d993a07;hp=0ddfdfc3ad50c6ed281cac7a05b5910dd43546a7;hb=e4b6fc3238ad9911fd40ef25accf82a401cb190f;hpb=9212ce268f3a4a9f3f019f23f6eef8b57207d340

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 0ddfdfc3..f1304a95 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -245,6 +245,9 @@ public class TelemetryService extends Service {
 	}
 
 	private void startAltosBluetooth() {
+		if (device == null) {
+			return;
+		}
 		if (mAltosBluetooth == null) {
 			if (D) Log.d(TAG, String.format("startAltosBluetooth(): Connecting to %s (%s)", device.getName(), device.getAddress()));
 			mAltosBluetooth = new AltosBluetooth(device, mHandler);
@@ -274,6 +277,8 @@ public class TelemetryService extends Service {
 
 	private void connected() {
 		try {
+			if (mAltosBluetooth == null)
+				throw new InterruptedException("no bluetooth");
 			mConfigData = mAltosBluetooth.config_data();
 		} catch (InterruptedException e) {
 		} catch (TimeoutException e) {