From a1a266093d0b29b7cbf100c1ee416f42d8e93639 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 25 Apr 2020 15:52:30 +0200 Subject: [PATCH] improve fix --- radio/src/gui/gui_common.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 6a349aa6d..498c63a89 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -739,19 +739,14 @@ bool isTrainerModeAvailable(int mode) return g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER; #endif -#if defined(PCBX9E) +#if !defined(BLUETOOTH) || defined(PCBX9E) if (mode == TRAINER_MODE_MASTER_BLUETOOTH || mode == TRAINER_MODE_SLAVE_BLUETOOTH) return false; -#elif defined(BLUETOOTH) +#else if (g_eeGeneral.bluetoothMode != BLUETOOTH_TRAINER && (mode == TRAINER_MODE_MASTER_BLUETOOTH || mode == TRAINER_MODE_SLAVE_BLUETOOTH)) return false; #endif -#if !defined(BLUETOOTH) - if (mode == TRAINER_MODE_MASTER_BLUETOOTH || mode == TRAINER_MODE_SLAVE_BLUETOOTH) - return false; -#endif - #if defined(PCBXLITE) && !defined(PCBXLITES) if (mode == TRAINER_MODE_MASTER_TRAINER_JACK || mode == TRAINER_MODE_SLAVE) return false;