From 985dff2af728eea1ba754f3212739826811d6e06 Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Sun, 15 Jan 2017 10:01:30 +0100 Subject: [PATCH] Fixes #3683: Display trainer icon in master mode when IS_TRAINER_INPUT_VALID() is true, don't rely on trainer jack connected detection. (#4233) --- radio/src/gui/212x64/view_main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/212x64/view_main.cpp b/radio/src/gui/212x64/view_main.cpp index 896cbec70..cda224712 100644 --- a/radio/src/gui/212x64/view_main.cpp +++ b/radio/src/gui/212x64/view_main.cpp @@ -260,15 +260,15 @@ void displayTopBar() x -= 12; } - if (TRAINER_CONNECTED()) { - if (SLAVE_MODE()) { + if (SLAVE_MODE()) { + if (TRAINER_CONNECTED()) { LCD_NOTIF_ICON(x, ICON_TRAINEE); x -= 12; } - else if (IS_TRAINER_INPUT_VALID()) { - LCD_NOTIF_ICON(x, ICON_TRAINER); - x -= 12; - } + } + else if (IS_TRAINER_INPUT_VALID()) { + LCD_NOTIF_ICON(x, ICON_TRAINER); + x -= 12; } if (isFunctionActive(FUNCTION_LOGS)) {