diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/action.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/action.c b/apps/action.c index 9ea46dc095..e8c3e8675e 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -594,6 +594,13 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur) | |||
594 | int context = cur->context; | 594 | int context = cur->context; |
595 | cur->is_prebutton = false; | 595 | cur->is_prebutton = false; |
596 | 596 | ||
597 | #ifdef HAVE_LOCKED_ACTIONS | ||
598 | /* This only applies to the first context, to allow locked contexts to | ||
599 | * specify a fall through to their non-locked version */ | ||
600 | if (is_keys_locked()) | ||
601 | context |= CONTEXT_LOCKED; | ||
602 | #endif | ||
603 | |||
597 | #ifndef DISABLE_ACTION_REMAP | 604 | #ifndef DISABLE_ACTION_REMAP |
598 | /* attempt to look up the button in user supplied remap */ | 605 | /* attempt to look up the button in user supplied remap */ |
599 | if(last->key_remap && (context & CONTEXT_PLUGIN) == 0) | 606 | if(last->key_remap && (context & CONTEXT_PLUGIN) == 0) |
@@ -625,13 +632,6 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur) | |||
625 | } | 632 | } |
626 | #endif | 633 | #endif |
627 | 634 | ||
628 | #ifdef HAVE_LOCKED_ACTIONS | ||
629 | /* This only applies to the first context, to allow locked contexts to | ||
630 | * specify a fall through to their non-locked version */ | ||
631 | if (is_keys_locked()) | ||
632 | context |= CONTEXT_LOCKED; | ||
633 | #endif | ||
634 | |||
635 | i = 0; | 635 | i = 0; |
636 | action = ACTION_NONE; | 636 | action = ACTION_NONE; |
637 | /* attempt to look up the button in the in-built keymaps */ | 637 | /* attempt to look up the button in the in-built keymaps */ |