From 36e1dc152ba04e4ca295d558cded1de31da3be30 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Tue, 12 Nov 2024 08:29:49 +0900 Subject: [PATCH] Fix crash when canceling menu with two-finger touch Fixes #58. It was a regression by commit eeeab6e. --- src/selection.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/selection.c b/src/selection.c index 24a5e89..fb3d0d1 100644 --- a/src/selection.c +++ b/src/selection.c @@ -461,7 +461,10 @@ void sel_select() { key = sys_keywait(25, KEYWAIT_CANCELABLE); // Right-click exits the menu without waiting for button up. - if (key == SYS35KEY_SPC) break; + if (key == SYS35KEY_SPC) { + curElement = -1; + break; + } if (!key && prevkey == SYS35KEY_RET && curElement != -1) break; prevkey = key; @@ -536,7 +539,7 @@ void sel_select() { msg_nextPage(TRUE); } - if (prevkey == SYS35KEY_RET) { + if (curElement != -1) { sl_jmpNear(elmv[curElement]); if (cb_select_page != 0) { sl_callFar2(cb_select_page -1, cb_select_address);