diff options
Diffstat (limited to 'apps/action.c')
-rw-r--r-- | apps/action.c | 3 |
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) | |||
588 | * for a more in-depth explanation | 588 | * for a more in-depth explanation |
589 | * places action into current_action | 589 | * places action into current_action |
590 | */ | 590 | */ |
591 | |||
591 | static inline void action_code_lookup(action_last_t *last, action_cur_t *cur) | 592 | static inline void action_code_lookup(action_last_t *last, action_cur_t *cur) |
592 | { | 593 | { |
593 | int action, i; | 594 | int action, i; |
594 | int context = cur->context; | 595 | int context = cur->context; |
595 | cur->is_prebutton = false; | 596 | cur->is_prebutton = false; |
596 | 597 | ||
597 | #ifdef HAVE_LOCKED_ACTIONS | 598 | #if defined(HAVE_LOCKED_ACTIONS) && !defined(HAS_BUTTON_HOLD) |
598 | /* This only applies to the first context, to allow locked contexts to | 599 | /* This only applies to the first context, to allow locked contexts to |
599 | * specify a fall through to their non-locked version */ | 600 | * specify a fall through to their non-locked version */ |
600 | if (is_keys_locked()) | 601 | if (is_keys_locked()) |