From 7912bf3bee50ab03ba5ef385fec7723f8a146a9c Mon Sep 17 00:00:00 2001 From: Roman Artiukhin Date: Tue, 22 Oct 2024 16:28:22 +0300 Subject: 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 --- apps/action.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'apps') 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) int *button = &cur->button; *button = button_get_w_tmo(cur->timeout); - /* ************************************************************************** - * if action_wait_for_release() was called without a button being pressed - * then actually waiting for release would do the wrong thing, i.e. - * the next key press is entirely ignored. So, if here comes a normal - * button press (neither release nor repeat) the press is a fresh one and - * no point in waiting for release - * - * This logic doesn't work for touchscreen which can send normal - * button events repeatedly before the first repeat (as in BUTTON_REPEAT). - * These cannot be distinguished from the very first touch - * but there's nothing we can do about it here - */ - if (*button == BUTTON_NONE || (*button & (BUTTON_REPEAT|BUTTON_REL)) == 0) - { - last->wait_for_release = false; - } + /* ******************************************************** * Can return button immediately, sys_event & multimedia * button presses don't use the action system, Data from -- cgit v1.2.3