Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[FixRed] ClipV2 has a hold button -- news to me

Browse source 
HAVE_LOCKED_ACTIIONS requires !defined(HAVE_HOLD_BUTTON)

Change-Id: I1e98c282f17d11f08ea80cd5963b331a3ae19387
This commit is contained in:
William Wilgus 2022-12-31 17:12:36 -05:00
parent 6ebec601f9
commit 3def8fee8c
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/action.c
View file

@ -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())

1
firmware/export/config/sansaclipv2.h
View file

@ -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