Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosdroid / app / src / main / java / org / altusmetrum / AltosDroid / TelemetryService.java

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryService.java
index 31616c825371d5e4f2f411343edf4c2464b622b0..2c2095df68186847225e4480993754123be524a2 100644 (file)
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -416,7 +416,7 @@ public class TelemetryService extends Service implements AltosIdleMonitorListene
        }
 
        private void start_altos_bluetooth(DeviceAddress address, boolean pause) {
-               if (bluetooth_adapter == null || !bluetooth_adapter.isEnabled())
+               if (bluetooth_adapter == null || !bluetooth_adapter.isEnabled() || address.address == null)
                        return;
 
                disconnect(false);