From 3def8fee8c80a2fd85425d3278ec58de8de698c2 Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Sat, 31 Dec 2022 17:12:36 -0500 Subject: [FixRed] ClipV2 has a hold button -- news to me HAVE_LOCKED_ACTIIONS requires !defined(HAVE_HOLD_BUTTON) Change-Id: I1e98c282f17d11f08ea80cd5963b331a3ae19387 --- apps/action.c | 3 ++- firmware/export/config/sansaclipv2.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/action.c b/apps/action.c index 4504b97ff2..392f2c344c 100644 --- a/apps/action.c +++ b/apps/action.c @@ -588,13 +588,14 @@ static inline int get_next_context(const struct button_mapping *items, int i) * for a more in-depth explanation * places action into current_action */ + static inline void action_code_lookup(action_last_t *last, action_cur_t *cur) { int action, i; int context = cur->context; cur->is_prebutton = false; -#ifdef HAVE_LOCKED_ACTIONS +#if defined(HAVE_LOCKED_ACTIONS) && !defined(HAS_BUTTON_HOLD) /* This only applies to the first context, to allow locked contexts to * specify a fall through to their non-locked version */ if (is_keys_locked()) diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index f2b1115c81..6e369db681 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h @@ -69,7 +69,6 @@ #define HAVE_LCD_ENABLE #ifndef BOOTLOADER -#define HAVE_LOCKED_ACTIONS /* Define this if your LCD can be put to sleep. * HAVE_LCD_ENABLE should be defined as well. */ //#define HAVE_LCD_SLEEP -- cgit v1.2.3