libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 10:10:57 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

Do not block input overlay hotkeys (#14923)

Browse Source
This commit is contained in:
sonninnos 2023-01-29 15:52:03 +02:00 committed by GitHub
parent 2946e6704b
commit a055bcd16b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/input_driver.c
View File

@ -4316,7 +4316,8 @@ static void input_keys_pressed(
{
for (i = RARCH_FIRST_META_KEY; i < RARCH_BIND_LIST_END; i++)
{
bool bit_pressed = binds[port][i].valid
bool other_pressed = input_keys_pressed_other_sources(input_st, i, p_new_state);
bool bit_pressed = binds[port][i].valid
&& input_state_wrap(
input_st->current_driver,
input_st->current_data,
@ -4329,12 +4330,13 @@ static void input_keys_pressed(
i);
if ( bit_pressed
|| BIT64_GET(lifecycle_state, i)
|| input_keys_pressed_other_sources(input_st, i, p_new_state))
|| other_pressed
|| BIT64_GET(lifecycle_state, i))
{
if (libretro_hotkey_set || keyboard_hotkey_set)
{
if (block_hotkey[i])
/* Do not block "other source" (input overlay) presses */
if (block_hotkey[i] && !other_pressed)
continue;
}