From e05a445a34ac0a61e5e9a9303411aaf0e43a1b2a Mon Sep 17 00:00:00 2001 From: geeksville Date: Mon, 8 Jun 2020 14:30:07 -0700 Subject: [PATCH] fix autobug: if app is shutting down, the activtity might be killed while the BLE scan is still happening --- .../main/java/com/geeksville/mesh/ui/SettingsFragment.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt index 934890246..db3cc5c75 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt @@ -169,9 +169,11 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging { debug("onScanResult ${entry}") // If nothing was selected, by default select the first valid thing we see - if (selectedAddress == null && entry.bonded) + val activity = + GeeksvilleApplication.currentActivity as MainActivity? // Can be null if app is shutting down + if (selectedAddress == null && entry.bonded && activity != null) changeScanSelection( - GeeksvilleApplication.currentActivity as MainActivity, + activity, fullAddr ) addDevice(entry) // Add/replace entry