[Bugfix] FS#13857 - Keylock with USB bug (Fiio M3K)

rockbox-gerrit-noreply--- via rockbox-cvs <[email protected]> Wed, 29 Apr 2026 10:34:07 -0400

Newsgroups	gmane.comp.systems.archos.rockbox.cvs
Message-ID	<[email protected]>

commit 121c65b32a01ad1f135bb0baf0d491f9c7a34fbe
Author: William Wilgus <[email protected]>
Date:   Wed Apr 29 10:30:54 2026 -0400

    [Bugfix] FS#13857 - Keylock with USB bug (Fiio M3K)
    
    1. Lock buttons
    2. Lock indicator turns on
    3. Plug USB
    4. Lock indicator still turned on
    5. Unplug USB
    6. Lock indicator turns off but buttons still locked and if you
    press lock button you see "Buttons locked" splash
    
    pretty sure this is an issue with the touchpad on this device
    probably applies to other touchscreen targets too
    
    Change-Id: Ia0afee7d737f3a5a2755f53d176bd53dd57d87c5

diff --git a/apps/action.c b/apps/action.c
index aa21a61222..bd52e8177a 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -1440,6 +1440,9 @@ bool is_keys_locked(void)
 void set_selective_softlock_actions(bool selective, unsigned int mask)
 {
     action_last.keys_locked = false;
+#if defined(HAVE_TOUCHPAD) || defined(HAVE_TOUCHSCREEN)
+    button_enable_touch(true);
+#endif
     if (selective)
     {
         action_last.softlock_mask = mask | SEL_ACTION_ENABLED;
-- 
rockbox-cvs mailing list
[email protected]
https://lists.haxx.se/mailman/listinfo/rockbox-cvs