Add locked actions to all soft lock targets

fiio m3k native is currently the only player with
defined buttons different from the standard
mapping.

This allows the user to use the keyremap plugin
to specify differing keymaps for their device in the locked state

Change-Id: Ie0b447bba0d5978e8d23fed423df30c794afc6f9

1 files changed, 4 insertions, 9 deletions

diff --git a/apps/keymaps/keymap-fiiom3k.c b/apps/keymaps/keymap-fiiom3k.c
index a9744b908b..8b9cce2493 100644
--- a/apps/keymaps/keymap-fiiom3k.c
+++ b/apps/keymaps/keymap-fiiom3k.c
@@ -326,21 +326,16 @@ const struct button_mapping* get_context_mapping(int context)
 {
     switch (context)
     {
-        case CONTEXT_WPS|CONTEXT_LOCKED:
-            return button_context_wps_locked;
-        default:
-            context &= ~CONTEXT_LOCKED;
-            break;
-    }
-
-    switch (context)
-    {
         default:
+        case CONTEXT_STD | CONTEXT_LOCKED:
         case CONTEXT_STD:
             return button_context_standard;
+        case CONTEXT_WPS | CONTEXT_LOCKED:
+            return button_context_wps_locked;
         case CONTEXT_WPS:
             return button_context_wps;
         case CONTEXT_TREE:
+        case CONTEXT_MAINMENU | CONTEXT_LOCKED:
         case CONTEXT_MAINMENU:
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_tree_scroll_lr;