diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2023-03-17 23:43:39 +0000 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2023-03-18 17:47:19 +0000 |
commit | a0a59ab61019bc06d85f4db34a74a3b53f15f3b4 (patch) | |
tree | cecfd61c4e08b9e30903abed7cb790b1cd36b855 /apps/keymaps/keymap-ypr1.c | |
parent | 0c29d1788eae87eb1cba71a70b1facd6ff995eb2 (diff) | |
download | rockbox-a0a59ab61019bc06d85f4db34a74a3b53f15f3b4.tar.gz rockbox-a0a59ab61019bc06d85f4db34a74a3b53f15f3b4.zip |
Fix locked context fallthrough
Enabling locked actions for all softlock targets accidentally
broke keylock on touchscreens because the generic touchscreen
keymap was missed. Trying to lookup CONTEXT_WPS|CONTEXT_LOCKED
returned the mapping for CONTEXT_STD because the locked version
wasn't explicitly handled.
But on almost all cases, a context's keymap does not change when
the screen is locked. It makes more sense to mask out the locked
flag and only check for it where needed.
Change-Id: I65cda2de82950d272d4394fd772286699e7c3779
Diffstat (limited to 'apps/keymaps/keymap-ypr1.c')
-rw-r--r-- | apps/keymaps/keymap-ypr1.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/keymaps/keymap-ypr1.c b/apps/keymaps/keymap-ypr1.c index 0f991a881d..67f42f07c6 100644 --- a/apps/keymaps/keymap-ypr1.c +++ b/apps/keymaps/keymap-ypr1.c | |||
@@ -132,18 +132,15 @@ static const struct button_mapping button_context_radio[] = { | |||
132 | 132 | ||
133 | const struct button_mapping* target_get_context_mapping(int context) | 133 | const struct button_mapping* target_get_context_mapping(int context) |
134 | { | 134 | { |
135 | switch (context) | 135 | switch (context & ~CONTEXT_LOCKED) |
136 | { | 136 | { |
137 | case CONTEXT_STD | CONTEXT_LOCKED: | ||
138 | case CONTEXT_STD: | 137 | case CONTEXT_STD: |
139 | return button_context_standard; | 138 | return button_context_standard; |
140 | case CONTEXT_WPS | CONTEXT_LOCKED: | ||
141 | case CONTEXT_WPS: | 139 | case CONTEXT_WPS: |
142 | return button_context_wps; | 140 | return button_context_wps; |
143 | 141 | ||
144 | case CONTEXT_LIST: | 142 | case CONTEXT_LIST: |
145 | return button_context_list; | 143 | return button_context_list; |
146 | case CONTEXT_MAINMENU | CONTEXT_LOCKED: | ||
147 | case CONTEXT_MAINMENU: | 144 | case CONTEXT_MAINMENU: |
148 | case CONTEXT_CUSTOM|CONTEXT_TREE: | 145 | case CONTEXT_CUSTOM|CONTEXT_TREE: |
149 | return button_context_tree; | 146 | return button_context_tree; |