Fix yet another crash

Freeyourgadget · Feb 18, 2019 · b0fca75 · b0fca75
1 parent e069af3
commit b0fca75
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/btle/BtLEQueue.java
@@ -416,10 +416,14 @@ PendingIntent getScanCallbackIntent(boolean newUuid) {
     private void stopBleBackgroundScan() {
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             mHandler.removeCallbacks(mReduceBleScanIntervalRunnable);
-            mBluetoothScanner.stopScan(getScanCallbackIntent(false));
+            if(mBluetoothScanner != null) {
+                mBluetoothScanner.stopScan(getScanCallbackIntent(false));
+            }
         } else {
             mHandler.removeCallbacks(mRestartRunnable);
-            mBluetoothScanner.stopScan(mScanCallback);
+            if(mBluetoothScanner != null) {
+                mBluetoothScanner.stopScan(mScanCallback);
+            }
         }
     }