diff options
| author | William Wilgus <wilgus.william@gmail.com> | 2023-09-09 23:02:02 -0400 |
|---|---|---|
| committer | William Wilgus <wilgus.william@gmail.com> | 2023-09-09 23:04:55 -0400 |
| commit | c8c3de992633b8f1e2a07656863091bc4272580a (patch) | |
| tree | 15428f3d25286c2ad814dea12af9633ee6fe29a0 | |
| parent | 7bbaf74c5cfc93419f4c3b16171ad23fe34975be (diff) | |
| download | rockbox-c8c3de9926.tar.gz rockbox-c8c3de9926.zip | |
[Fix Red] Ability to control backlight for soft lock action
Change-Id: Ib8948a5c43dbc16707d45f81c192e21bf38215e3
| -rw-r--r-- | firmware/backlight.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c index 1466a58987..cc773e0a3b 100644 --- a/firmware/backlight.c +++ b/firmware/backlight.c @@ -23,6 +23,7 @@ #include "config.h" #if !defined(BOOTLOADER) #include "settings.h" +#include "action.h" #endif #include <stdlib.h> #include "cpu.h" @@ -39,7 +40,6 @@ #include "backlight.h" #include "lcd.h" #include "screendump.h" -#include "action.h" #ifdef HAVE_REMOTE_LCD #include "lcd-remote.h" @@ -846,9 +846,9 @@ bool is_backlight_on(bool ignore_always_off) int backlight_get_current_timeout(void) { if ((backlight_on_button_hold != 0) -#if defined(HAVE_REMOTE_LCD_AS_MAIN) && defined(HAS_REMOTE_BUTTON_HOLD) +#if (defined(HAVE_REMOTE_LCD_AS_MAIN) && defined(HAS_REMOTE_BUTTON_HOLD)) && remote_button_hold() -#elifdef HAS_BUTTON_HOLD +#elif defined(HAS_BUTTON_HOLD) && button_hold() #else && is_keys_locked() |