PKG: retroarch: OnlineUpdater & bump to e4221d4456

board/miyoo/boot/firstboot

@@ -914,6 +914,8 @@ else
 	echo -en "\nSuccessfully generated RA links, for detailed list pls see ${GMENU2X_LOGS} file."
 fi
 sleep 1
+echo -en "\nLocking installed libretro cores..." | tee -a ${GMENU2X_LOGS}
+retroarch-setup -d lock >> ${GMENU2X_LOGS}
 
 sync
 echo "firstboot script finished." | tee -a ${LOG}

board/miyoo/rootfs/usr/bin/retroarch-setup

@@ -34,7 +34,7 @@ while getopts "rsqdc:" opt; do
       debug=true
       ;;
     \?)
-      echo "Usage: $0 [-rsqd] [-c <retroarch.cfg>] <menu(default)|kiosk|minimal|history|update>" >&2
+      echo "Usage: $0 [-rsqd] [-c <retroarch.cfg>] <menu(default)|kiosk|minimal|history|update|lock|unlock>" >&2
       exit 1
       ;;
   esac
@@ -69,13 +69,14 @@ ra_path="${HOME}/emus/retroarch"
 ra_config_path="${HOME}/.retroarch"
 history_path="${ra_config_path}/playlists/builtin/content_history.lpl" ## RA ver. >1.22.2
 
-cd "${ra_path}" || { echo -en "\nERROR: Failed to cd into ${ra_path}, no RetroArch to launch.\n\nEXITING..." ; exit 1; }
+test -d "${ra_path}" || { echo -en "\nERROR: Missing ${ra_path}, no RetroArch to work with.\n\nEXITING..." ; exit 1; }
 
 if test "${ra_mode}" == "history"; then
   if test -f "${history_path}"; then
     rom_path="$(head -n20 "${history_path}" | grep -Eo -m1 '/roms/[^"]+')"
     core_path="$(head -n20 "${history_path}" | grep -Eo -m1 "${ra_config_path}/cores/.+\.so")"
     if test -f "${core_path}" -a -f "${rom_path}"; then
+      cd "${ra_path}" || { echo -en "\nERROR: Failed to cd into ${ra_path}, no RetroArch to launch.\n\nEXITING..." ; exit 1; }
       ./retroarch --libretro "${core_path}" "${rom_path}"
     else
       echo -e "ERROR: ROM file in $rom_path or libretro CORE in $core_path does not exist"
@@ -86,16 +87,30 @@ if test "${ra_mode}" == "history"; then
     exit 1
   fi
   exit 0
+elif test "${ra_mode}" == "lock" || test "${ra_mode}" == "unlock"; then
+  ## Lock installed cores
+  for file in "${ra_config_path}/cores"/*.so; do
+    if test -f "$file"; then
+      corefile_no_ext="$(echo "$file" | sed 's:\.so::g')"
+      if ! test -f "${corefile_no_ext}".lck && test "${ra_mode}" == "lock"; then
+        touch "${corefile_no_ext}".lck && \
+          { if $debug; then echo -en "\nDEBUG: Locked core $(echo "${corefile_no_ext}" | sed 's:.*\/::')"; fi; }
+      elif test -f "${corefile_no_ext}".lck && test "${ra_mode}" == "unlock"; then
+        rm "${corefile_no_ext}".lck && \
+          { if $debug; then echo -en "\nDEBUG: Unlocked core $(echo "${corefile_no_ext}" | sed 's:.*\/::')"; fi; }      
+      fi
+    fi
+  done
 elif test "${ra_mode}" == "update"; then
   if test -e "${ra_path}/retroarch"; then
     ## Generate list of cores to be used
     cores_dir="${ra_config_path}/cores"
     cores_info_dir="${ra_config_path}/core_info"
     cores_updated=false
-    for file in $cores_dir/*; do
+    for file in $cores_dir/*.so; do
       if test -f "$file"; then
         core_file="$(echo "$file" | sed 's:.*\/::')"
-        core_name="$(echo "${core_file}" | sed 's:_libretro.so::g')"
+        core_name="$(echo "${core_file}" | sed 's:_libretro\.so::g')"
         core_info_file="${cores_info_dir}/${core_name}_libretro.info"
         if test -f ${core_info_file}; then
           core_corename="$(sed -n 's:^corename = ::p' "${core_info_file}" | tr -d '"')"
@@ -174,6 +189,7 @@ else
     exit 1;
   else #menu
     ra_append_cfg="${ra_path}/retroarch_menu.cfg"
+    ra_mode="menu"
   fi
 
   #secondary options (shift values)
@@ -210,6 +226,7 @@ else
     ra_append_cfg="$(echo "${ra_append_cfg}\|${ra_path}/retroarch_cfgsave.cfg" | tr -d '\')"
     echo "exec: retroarch --appendconfig=${ra_append_cfg}"
     (sleep 6; killall retroarch) &
+    cd "${ra_path}" || { echo -en "\nERROR: Failed to cd into ${ra_path}, no RetroArch to launch.\n\nEXITING..." ; exit 1; }
     ./retroarch --appendconfig "${ra_append_cfg}"
   fi
 fi

package/miyoo/retroarch/libretro-retroarch/0001-Makefile.miyoo-use-STAGING-dir-of-BR2.patch

@@ -1,4 +1,4 @@
-From 666e35789b7b4259f91cf1cd5f28f594b6c19257 Mon Sep 17 00:00:00 2001
+From 2bbe81257019ef69b7fa7d064043151985f26afc Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Mon, 10 Mar 2025 20:39:21 +0100
 Subject: [PATCH] Makefile.miyoo: use STAGING dir of BR2

package/miyoo/retroarch/libretro-retroarch/0002-config.def.h-disable-Vsync.patch

@@ -1,4 +1,4 @@
-From 32558e1816d75d795ff3f03f3250d5b5d41b3db4 Mon Sep 17 00:00:00 2001
+From 7233016be0a98f93f3389118f811eec64c497803 Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Mon, 10 Mar 2025 20:40:29 +0100
 Subject: [PATCH] config.def.h: disable Vsync
@@ -23,7 +23,7 @@ index 8876292bd4..95cc30d856 100644
  ASFLAGS :=
  LDFLAGS := -Wl,--gc-sections
 diff --git a/config.def.h b/config.def.h
-index 85164ea788..dd21de39e5 100644
+index 49b35076b0..073e128571 100644
 --- a/config.def.h
 +++ b/config.def.h
 @@ -367,7 +367,7 @@
@@ -35,7 +35,7 @@ index 85164ea788..dd21de39e5 100644
 
  /* Vulkan specific */
  #define DEFAULT_MAX_SWAPCHAIN_IMAGES 3
-@@ -548,7 +548,7 @@
+@@ -547,7 +547,7 @@
  #if defined(DINGUX)
  /* Enables aspect ratio correction (1:1 PAR) when
   * using the IPU hardware scaler in Dingux devices */

package/miyoo/retroarch/libretro-retroarch/0003-Change-def-gamepad-driver-sdl_dingux-to-sdl-rebind.patch

@@ -1,4 +1,4 @@
-From fb0bfee46c19c60c72572d606e6241324bce6d48 Mon Sep 17 00:00:00 2001
+From 82974051ff694b37721dbb2fd3c7d7003856f401 Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Mon, 10 Mar 2025 20:42:53 +0100
 Subject: [PATCH] Change def gamepad driver (sdl_dingux  to sdl) & rebind
@@ -25,10 +25,10 @@ index 95cc30d856..ca93214ffa 100644
  DEF_FLAGS += -std=gnu99 -D_GNU_SOURCE
  LIBS := -ldl -lz -lrt -pthread -lasound
 diff --git a/config.def.h b/config.def.h
-index dd21de39e5..c7aec5febe 100644
+index 073e128571..6b0a1d5422 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -1640,8 +1640,10 @@
+@@ -1641,8 +1641,10 @@
  #define DEFAULT_INPUT_DESCRIPTOR_LABEL_SHOW true
  #define DEFAULT_INPUT_DESCRIPTOR_HIDE_UNBOUND false
 
@@ -41,10 +41,10 @@ index dd21de39e5..c7aec5febe 100644
  #define DEFAULT_INPUT_MAX_USERS 8
  #endif
 diff --git a/config.def.keybinds.h b/config.def.keybinds.h
-index 0450af305f..37e04d3181 100644
+index 85d3d51ec0..f1902ef99c 100644
 --- a/config.def.keybinds.h
 +++ b/config.def.keybinds.h
-@@ -686,146 +686,146 @@ static const struct retro_keybind retro_keybinds_1[] = {
+@@ -693,146 +693,146 @@ static const struct retro_keybind retro_keybinds_1[] = {
     { 
        NULL, NULL,
        AXIS_NONE, AXIS_NONE,
@@ -216,7 +216,7 @@ index 0450af305f..37e04d3181 100644
        MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS, RETROK_UNKNOWN,
        RARCH_ANALOG_RIGHT_X_PLUS, NO_BTN, NO_BTN, 0,
        true
-@@ -946,8 +946,8 @@ static const struct retro_keybind retro_keybinds_1[] = {
+@@ -960,8 +960,8 @@ static const struct retro_keybind retro_keybinds_1[] = {
     {
        NULL, NULL,
        AXIS_NONE, AXIS_NONE,
@@ -228,7 +228,7 @@ index 0450af305f..37e04d3181 100644
     },
     {
 diff --git a/configuration.c b/configuration.c
-index b815b7c304..b8fabf3021 100644
+index 6fbf77d10f..49bfb8fe1b 100644
 --- a/configuration.c
 +++ b/configuration.c
 @@ -645,13 +645,13 @@ static const enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_SWITCH;

package/miyoo/retroarch/libretro-retroarch/0004-input-driver-correct-Miyoo-mapping-in-MENU.patch

@@ -1,4 +1,4 @@
-From 6ddaba0640c88773aeaa91e001cab8b4d4ae15b2 Mon Sep 17 00:00:00 2001
+From e3f1f0fadaef9b08a2580d553c708e1d16e07443 Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Wed, 30 Apr 2025 23:08:23 +0200
 Subject: [PATCH] input/driver: correct Miyoo mapping in MENU
@@ -8,10 +8,10 @@ Subject: [PATCH] input/driver: correct Miyoo mapping in MENU
  1 file changed, 40 insertions(+)
 
 diff --git a/input/input_driver.c b/input/input_driver.c
-index 5334198024..d202b68eae 100644
+index 7b07939e37..dc25bd350b 100644
 --- a/input/input_driver.c
 +++ b/input/input_driver.c
-@@ -6941,6 +6941,22 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
+@@ -7258,6 +7258,22 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
           unsigned i;
           unsigned ids[][2] =
           {
@@ -34,15 +34,15 @@ index 5334198024..d202b68eae 100644
              {RETROK_RETURN,    RETRO_DEVICE_ID_JOYPAD_A      },
              {RETROK_BACKSPACE, RETRO_DEVICE_ID_JOYPAD_B      },
              {RETROK_DELETE,    RETRO_DEVICE_ID_JOYPAD_Y      },
-@@ -6955,6 +6971,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
+@@ -7272,6 +7288,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
              {RETROK_PAGEDOWN,  RETRO_DEVICE_ID_JOYPAD_R      },
              {RETROK_HOME,      RETRO_DEVICE_ID_JOYPAD_L3     },
              {RETROK_END,       RETRO_DEVICE_ID_JOYPAD_R3     },
 +#endif
              /* Extra keys read regardless of 'enable_hotkey' */
              {0,                RARCH_QUIT_KEY                }, /* 14 */
              {0,                RARCH_FULLSCREEN_TOGGLE_KEY   },
-@@ -6999,7 +7016,11 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
+@@ -7316,7 +7333,11 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
           unsigned i;
           unsigned ids[][2] =
           {
@@ -54,7 +54,7 @@ index 5334198024..d202b68eae 100644
              {RETROK_UP,        RETRO_DEVICE_ID_JOYPAD_UP     },
              {RETROK_DOWN,      RETRO_DEVICE_ID_JOYPAD_DOWN   },
              {RETROK_LEFT,      RETRO_DEVICE_ID_JOYPAD_LEFT   },
-@@ -7160,6 +7181,24 @@ void input_keyboard_event(bool down, unsigned code,
+@@ -7477,6 +7498,24 @@ void input_keyboard_event(bool down, unsigned code,
      * is active */
     if (menu_st->flags & MENU_ST_FLAG_SCREENSAVER_ACTIVE)
     {
@@ -79,7 +79,7 @@ index 5334198024..d202b68eae 100644
        if (   (down)
            && (code != RETROK_UNKNOWN)
            && (menu_input_dialog_get_display_kb()
-@@ -7176,6 +7215,7 @@ void input_keyboard_event(bool down, unsigned code,
+@@ -7493,6 +7532,7 @@ void input_keyboard_event(bool down, unsigned code,
            ||   (code == RETROK_RETURN)      /* RETRO_DEVICE_ID_JOYPAD_A */
            ||   (code == RETROK_DELETE)      /* RETRO_DEVICE_ID_JOYPAD_Y */
            ||   (BIT512_GET(input_st->keyboard_mapping_bits, code)))))

package/miyoo/retroarch/libretro-retroarch/0005-Makefile.miyoo-enable-Networking.patch

@@ -1,4 +1,4 @@
-From d7842088287f06355148ca6604646c11ba347485 Mon Sep 17 00:00:00 2001
+From 40bf47bed90c5451473c5516648e6a9ee81cff1b Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Mon, 10 Mar 2025 20:46:29 +0100
 Subject: [PATCH] Makefile.miyoo: enable Networking

package/miyoo/retroarch/libretro-retroarch/0006-sdl_input-remove-input-polling-for-console-inputs.patch

@@ -1,4 +1,4 @@
-From bb054791d9040f6d3dedb3c691e825178af98724 Mon Sep 17 00:00:00 2001
+From 861157f180b647781847168d8ec8bf6cd8e8bd66 Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Wed, 30 Apr 2025 23:13:22 +0200
 Subject: [PATCH] sdl_input: remove input polling for console inputs
@@ -9,10 +9,10 @@ fix double events register in e.g. on screen keyboard (osk), when using handheld
  1 file changed, 19 insertions(+)
 
 diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c
-index 1b4a6c09c4..919eb45dd7 100644
+index 56a3e75b97..b928204fef 100644
 --- a/input/drivers/sdl_input.c
 +++ b/input/drivers/sdl_input.c
-@@ -518,6 +518,25 @@ static void sdl_input_poll(void *data)
+@@ -546,6 +546,25 @@ static void sdl_input_poll(void *data)
           if (event.key.keysym.mod & 0x8000 /*KMOD_SCROLL*/)
              mod |= RETROKMOD_SCROLLOCK;
 

package/miyoo/retroarch/libretro-retroarch/0007-input_driver-hack-for-swapped-OK-CANCEL-in-OSK.patch

@@ -1,4 +1,4 @@
-From e621668ad2ac66e5769c82780206b66588368a60 Mon Sep 17 00:00:00 2001
+From 6ca357d28f794cef3ec9c85790c081e60905382f Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Wed, 30 Apr 2025 22:54:35 +0200
 Subject: [PATCH] input_driver: hack for swapped OK/CANCEL in OSK
@@ -11,18 +11,18 @@ ok - add sign
  1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/input/input_driver.c b/input/input_driver.c
-index d202b68eae..adf6c6cbe3 100644
+index dc25bd350b..6664e234ee 100644
 --- a/input/input_driver.c
 +++ b/input/input_driver.c
-@@ -7018,6 +7018,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
+@@ -7335,6 +7335,7 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
           {
  #ifdef MIYOO
              {RETROK_LALT,     RETRO_DEVICE_ID_JOYPAD_A      },
 +            {RETROK_LCTRL,     RETRO_DEVICE_ID_JOYPAD_B      },
  #else
              {RETROK_LCTRL,     RETRO_DEVICE_ID_JOYPAD_A      },
  #endif
-@@ -7031,7 +7032,10 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
+@@ -7348,7 +7349,10 @@ void input_driver_collect_system_input(input_driver_state_t *input_st,
           };
 
           if (settings->bools.input_menu_swap_ok_cancel_buttons)

package/miyoo/retroarch/libretro-retroarch/0008-configuration-set-active-Unified-Menu-Controls.patch

@@ -1,4 +1,4 @@
-From 0b53f1b9a799e20d3cd30f2da09f7a52b97dd5d3 Mon Sep 17 00:00:00 2001
+From 7d4894a168d9bfc733ca194b87a8fde9365955ae Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Wed, 30 Apr 2025 23:04:15 +0200
 Subject: [PATCH] configuration: set active "Unified Menu Controls"
@@ -8,10 +8,10 @@ Subject: [PATCH] configuration: set active "Unified Menu Controls"
  1 file changed, 4 insertions(+)
 
 diff --git a/configuration.c b/configuration.c
-index b8fabf3021..d3aba25012 100644
+index 49bfb8fe1b..36c81fd041 100644
 --- a/configuration.c
 +++ b/configuration.c
-@@ -1950,7 +1950,11 @@ static struct config_bool_setting *populate_settings_bool(
+@@ -1962,7 +1962,11 @@ static struct config_bool_setting *populate_settings_bool(
  #endif
 
  #ifdef HAVE_MENU

package/miyoo/retroarch/libretro-retroarch/0009-config.def.h-update-default-configuration.patch

@@ -1,21 +1,21 @@
-From e44eda78c9b6629df71d44afd7f39ab75415681f Mon Sep 17 00:00:00 2001
+From 5745309faaad28e61b50fd7d77e2c4653f050112 Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Thu, 18 Dec 2025 14:01:04 +0100
 Subject: [PATCH] config.def.h: update default configuration
 
 - don't swap OK/CANCEL buttons
 - quit_on_close_content (CLI)
 - don't show RESTART app in menu (broken)
-- don't Confirm to Quit/Close/Reset (thus press twice)
+- don't Confirm to Quit/Close (thus press twice)
 ---
- config.def.h | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ config.def.h | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/config.def.h b/config.def.h
-index c7aec5febe..aec48d7253 100644
+index 6b0a1d5422..44db234e72 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -761,7 +761,7 @@
+@@ -762,7 +762,7 @@
  #define DEFAULT_MENU_SHOW_CONFIGURATIONS true
  #define DEFAULT_MENU_SHOW_HELP true
  #define DEFAULT_MENU_SHOW_QUIT true
@@ -24,7 +24,7 @@ index c7aec5febe..aec48d7253 100644
  #define DEFAULT_MENU_SHOW_REBOOT true
  #define DEFAULT_MENU_SHOW_SHUTDOWN true
  #ifdef HAVE_MIST
-@@ -794,7 +794,7 @@
+@@ -791,7 +791,7 @@
 
  #define DEFAULT_MENU_INSERT_DISK_RESUME true
 
@@ -33,7 +33,7 @@ index c7aec5febe..aec48d7253 100644
 
  /* While the menu is active, supported drivers
   * will display a screensaver after SCREENSAVER_TIMEOUT
-@@ -966,7 +966,11 @@
+@@ -963,7 +963,11 @@
  #define DEFAULT_OVERLAY_DPAD_DIAGONAL_SENSITIVITY 80
  #define DEFAULT_OVERLAY_ABXY_DIAGONAL_SENSITIVITY 50
 
@@ -45,15 +45,17 @@ index c7aec5febe..aec48d7253 100644
  #define DEFAULT_MENU_SWAP_SCROLL_BUTTONS false
  #define DEFAULT_MENU_SINGLECLICK_PLAYLISTS false
  #define DEFAULT_MENU_ALLOW_TABS_BACK true
-@@ -977,7 +981,7 @@
+@@ -974,8 +978,8 @@
  #define DEFAULT_ALL_USERS_CONTROL_MENU false
  #endif
 
--#define DEFAULT_QUIT_PRESS_TWICE true
-+#define DEFAULT_QUIT_PRESS_TWICE false
+-#define DEFAULT_CONFIRM_QUIT true
+-#define DEFAULT_CONFIRM_CLOSE true
++#define DEFAULT_CONFIRM_QUIT false
++#define DEFAULT_CONFIRM_CLOSE false
+ #define DEFAULT_CONFIRM_RESET true
 
  #define DEFAULT_LOG_TO_FILE false
-
 -- 
 2.45.2.windows.1
 

package/miyoo/retroarch/libretro-retroarch/0010-input_driver-toggle-menu-even-with-hotkey-press.patch

@@ -1,4 +1,4 @@
-From 4d78f64c448672a0dbb73cd723148e432956e0a2 Mon Sep 17 00:00:00 2001
+From ac169f82287255d34b9b4df9ca245f0b644c615e Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Fri, 19 Dec 2025 22:29:35 +0100
 Subject: [PATCH] input_driver: toggle menu even with hotkey press
@@ -8,10 +8,10 @@ Subject: [PATCH] input_driver: toggle menu even with hotkey press
  1 file changed, 24 insertions(+)
 
 diff --git a/input/input_driver.c b/input/input_driver.c
-index adf6c6cbe3..fc06ba50ad 100644
+index 6664e234ee..153c5d52e6 100644
 --- a/input/input_driver.c
 +++ b/input/input_driver.c
-@@ -5815,6 +5815,30 @@ static void input_keys_pressed(
+@@ -6078,6 +6078,30 @@ static void input_keys_pressed(
           BIT256_SET_PTR(p_new_state, RARCH_ENABLE_HOTKEY);
     }
 

package/miyoo/retroarch/libretro-retroarch/0011-nput_driver-fix-toggle-menu-without-hotkey-press.patch

@@ -1,4 +1,4 @@
-From 248b4f88e5f38d5f9c874ebb7633b356f4e34d7a Mon Sep 17 00:00:00 2001
+From 504fdd02ddb5504da0596b81d35810e9c13a0b0c Mon Sep 17 00:00:00 2001
 From: Apaczer <94932128+Apaczer@users.noreply.github.com>
 Date: Sat, 27 Dec 2025 23:21:47 +0100
 Subject: [PATCH] nput_driver: fix toggle menu without hotkey press
@@ -8,13 +8,13 @@ Subject: [PATCH] nput_driver: fix toggle menu without hotkey press
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/input/input_driver.c b/input/input_driver.c
-index fc06ba50ad..a8f11fec99 100644
+index 153c5d52e6..0b372b336f 100644
 --- a/input/input_driver.c
 +++ b/input/input_driver.c
-@@ -5794,7 +5794,7 @@ static void input_keys_pressed(
-    /* Ignore hotkey block delay when menu toggle and hotkey enabler share the same key */
+@@ -6057,7 +6057,7 @@ static void input_keys_pressed(
     if (     !any_pressed
           && !(input_st->flags & INP_FLAG_WAIT_INPUT_RELEASE)
+          && !(input_st->flags & INP_FLAG_KB_MAPPING_BLOCKED)
 -         && binds[port][RARCH_MENU_TOGGLE].key == binds[port][RARCH_ENABLE_HOTKEY].key)
 +         && binds[port][RARCH_MENU_TOGGLE].key)
     {