summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Artiukhin <bahusdrive@gmail.com>2024-10-22 16:28:22 +0300
committerRoman Artiukhin <bahusdrive@gmail.com>2024-10-22 16:28:22 +0300
commit7912bf3bee50ab03ba5ef385fec7723f8a146a9c (patch)
treeab9003ebf336db28cf60c6f7b7ecf37034334dc5
parenteb2d596d72247d90a89fc3b1c702b5b54aaecf6b (diff)
downloadrockbox-7912bf3bee50ab03ba5ef385fec7723f8a146a9c.tar.gz
rockbox-7912bf3bee50ab03ba5ef385fec7723f8a146a9c.zip
Fix prev/next folder action leads to immediate ff/rewind
Removed check that was introduced in 54e6bafa. This check doesn't work in WPS as BUTTON_NONE actions come while you still have button pressed. I believe the proper fix for this is already commited in c354e0bd. Fixes FS#13370 Change-Id: I86e92c296c0bfa42caaed9cb3540e311630daf9c
-rw-r--r--apps/action.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/apps/action.c b/apps/action.c
index 9d66dd131b..d657deb7fd 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -323,22 +323,7 @@ static inline bool action_poll_button(action_last_t *last, action_cur_t *cur)
323 int *button = &cur->button; 323 int *button = &cur->button;
324 324
325 *button = button_get_w_tmo(cur->timeout); 325 *button = button_get_w_tmo(cur->timeout);
326 /* ************************************************************************** 326
327 * if action_wait_for_release() was called without a button being pressed
328 * then actually waiting for release would do the wrong thing, i.e.
329 * the next key press is entirely ignored. So, if here comes a normal
330 * button press (neither release nor repeat) the press is a fresh one and
331 * no point in waiting for release
332 *
333 * This logic doesn't work for touchscreen which can send normal
334 * button events repeatedly before the first repeat (as in BUTTON_REPEAT).
335 * These cannot be distinguished from the very first touch
336 * but there's nothing we can do about it here
337 */
338 if (*button == BUTTON_NONE || (*button & (BUTTON_REPEAT|BUTTON_REL)) == 0)
339 {
340 last->wait_for_release = false;
341 }
342 /* ******************************************************** 327 /* ********************************************************
343 * Can return button immediately, sys_event & multimedia 328 * Can return button immediately, sys_event & multimedia
344 * button presses don't use the action system, Data from 329 * button presses don't use the action system, Data from