From 0d21dee0b04d5ad58693ab8bb98ce90ca7bc4f8f Mon Sep 17 00:00:00 2001 From: "Jang,Pyohwan" Date: Thu, 10 Sep 2026 23:32:05 +0900 Subject: [PATCH] configgen: remove dead input_exit_emulator_btn write in writeHotKeyConfig Live-tested with this removed on ODROID-M1: Hotkey+Start still exits a running libretro core fine. hotkeygen synthesizes a keyboard Shift+Esc for the retroarch context's 'exit' action, and RetroArch's own default config already binds input_exit_emulator="escape" to that. This per-controller joypad binding was never the actual path. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01S6emcPYtMgjwcmPBmUt74u --- .../generators/libretro/libretroControllers.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroControllers.py b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroControllers.py index afd4a4f3265..a30b3467a84 100755 --- a/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroControllers.py +++ b/package/batocera/core/batocera-configgen/configgen/configgen/generators/libretro/libretroControllers.py @@ -89,22 +89,6 @@ def cleanControllerConfig(retroconfig: UnixSettings, controllers: Controllers, / def writeHotKeyConfig(retroconfig: UnixSettings, controllers: Controllers, /) -> None: if controllers and 'hotkey' in controllers[0].inputs and controllers[0].inputs['hotkey'].type == 'button': retroconfig.save('input_enable_hotkey_btn', controllers[0].inputs['hotkey'].id) - # Without this, input_enable_hotkey_btn alone arms the hotkey - # modifier but no joypad action is bound to it, so Hotkey+Start - # (the batocera keyboard convention for force-quitting a game, see - # es_input.cfg's keyboard hotkey=select binding) does nothing on a - # gamepad - only the keyboard input_exit_emulator="escape" above - # ever quits a running libretro core. Confirmed live on hardware - # (ODROID-M1, SHAKS S6b pad): Hotkey+Start did not exit FBNeo - # until this was added. - # - # Nested inside the hotkey check (not a second top-level if): if a - # pad has no hotkey button mapped, RetroArch treats a lone - # input_exit_emulator_btn as unmodified - Start alone would quit - # mid-game on every such pad, on every board, the moment - # controllers are configured at all. - if 'start' in controllers[0].inputs and controllers[0].inputs['start'].type == 'button': - retroconfig.save('input_exit_emulator_btn', controllers[0].inputs['start'].id) # Write a configuration for a specified controller def writeControllerConfig(