summaryrefslogtreecommitdiffstats
path: root/apps/action.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/action.c')
-rw-r--r--apps/action.c3
1 files changed, 2 insertions, 1 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())