diff options
| author | Mike Beattie <mike@ethernal.org> | 2012-08-28 21:54:05 +1200 |
|---|---|---|
| committer | Mike Beattie <mike@ethernal.org> | 2012-08-28 21:54:05 +1200 |
| commit | c7bef83fd553987f83c0bf7ff37ef941872564fe (patch) | |
| tree | 9ae89825842105177d0f851c5b75f484903ccde1 | |
| parent | 150a726e125aa7d181c00348ddd1791fd84164e5 (diff) | |
altosdroid: fix double call of stopAltosBluetooth()
Signed-off-by: Mike Beattie <mike@ethernal.org>
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java | 7 |
1 files changed, 5 insertions, 2 deletions
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)); |