From 9627360fac05b8d13830660acceaa8f4f7a824ca Mon Sep 17 00:00:00 2001
From: TaaviE <taavi.eomae+github@gmail.com>
Date: Sun, 2 Aug 2020 21:23:14 +0300
Subject: [PATCH] Fixed an UI error when Bluetooth discovery starting fails

---
 .../gadgetbridge/activities/DiscoveryActivity.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
index 8fccda152..d0dd25a3a 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DiscoveryActivity.java
@@ -614,15 +614,18 @@ public class DiscoveryActivity extends AbstractGBActivity implements AdapterView
      */
     private void startBTDiscovery(Scanning what) {
         LOG.info("Starting BT discovery");
-        setIsScanning(what);
 
         handler.removeMessages(0, stopRunnable);
         handler.sendMessageDelayed(getPostMessage(stopRunnable), SCAN_DURATION);
         if (adapter.startDiscovery()) {
+            LOG.debug("Discovery starting successful");
+            bluetoothProgress.setVisibility(View.VISIBLE);
+            setIsScanning(what);
+        } else {
             LOG.error("Discovery starting failed");
+            bluetoothProgress.setVisibility(View.GONE);
+            setIsScanning(Scanning.SCANNING_OFF);
         }
-
-        bluetoothProgress.setVisibility(View.VISIBLE);
     }
 
     private void stopBTDiscovery() {