From eb883af897fa6bce28263fba5a18c78edf12cf57 Mon Sep 17 00:00:00 2001
From: Kilrah <kilrah@andrebernet.ch>
Date: Mon, 27 May 2019 08:41:24 +0200
Subject: [PATCH] Properly disable BT when module not present

(cherry picked from commit 2bc9a00f32a29a085e4764042ffc7d61019944f1)
---
 radio/src/gui/128x64/radio_hardware.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp
index 8fa93badc..61ea3414b 100644
--- a/radio/src/gui/128x64/radio_hardware.cpp
+++ b/radio/src/gui/128x64/radio_hardware.cpp
@@ -237,6 +237,12 @@ void menuRadioHardware(event_t event)
   });
 
   uint8_t sub = menuVerticalPosition - HEADER_LINE;
+ 
+#if defined(BLUETOOTH)
+  if (g_eeGeneral.bluetoothMode != BLUETOOTH_OFF && !IS_BLUETOOTH_CHIP_PRESENT()) {
+    g_eeGeneral.bluetoothMode = BLUETOOTH_OFF;
+  }
+#endif
 
   for (uint8_t i=0; i<NUM_BODY_LINES; i++) {
     coord_t y = MENU_HEADER_HEIGHT + 1 + i*FH;
@@ -394,9 +400,6 @@ void menuRadioHardware(event_t event)
       case ITEM_RADIO_HARDWARE_BLUETOOTH_MODE:
         lcdDrawTextAlignedLeft(y, STR_BLUETOOTH);
         lcdDrawTextAtIndex(HW_SETTINGS_COLUMN2, y, STR_BLUETOOTH_MODES, g_eeGeneral.bluetoothMode, attr);
-        if (g_eeGeneral.bluetoothMode != BLUETOOTH_OFF && !IS_BLUETOOTH_CHIP_PRESENT()) {
-          g_eeGeneral.bluetoothMode = BLUETOOTH_OFF;
-        }
         if (attr) {
           g_eeGeneral.bluetoothMode = checkIncDecGen(event, g_eeGeneral.bluetoothMode, BLUETOOTH_OFF, BLUETOOTH_TRAINER);
         }