summaryrefslogtreecommitdiffstats
path: root/apps/action.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/action.c')
-rw-r--r--apps/action.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/action.c b/apps/action.c
index e8c3e8675e..9ea46dc095 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -594,13 +594,6 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur)
int context = cur->context;
cur->is_prebutton = false;
-#ifdef HAVE_LOCKED_ACTIONS
- /* 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())
- context |= CONTEXT_LOCKED;
-#endif
-
#ifndef DISABLE_ACTION_REMAP
/* attempt to look up the button in user supplied remap */
if(last->key_remap && (context & CONTEXT_PLUGIN) == 0)
@@ -632,6 +625,13 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur)
}
#endif
+#ifdef HAVE_LOCKED_ACTIONS
+ /* 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())
+ context |= CONTEXT_LOCKED;
+#endif
+
i = 0;
action = ACTION_NONE;
/* attempt to look up the button in the in-built keymaps */