mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 04:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-25 15:04:55 +02:00
parent 259cd900da
commit 4f678dfdfc
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input_driver.c
View File

@ -31,6 +31,7 @@
#ifdef HAVE_MENU #ifdef HAVE_MENU
#include "../menu/menu_driver.h" #include "../menu/menu_driver.h"
#include "../menu/menu_input.h"
#include "../menu/widgets/menu_input_dialog.h" #include "../menu/widgets/menu_input_dialog.h"
#endif #endif
@ -562,9 +563,6 @@ uint64_t input_menu_keys_pressed(void *data, uint64_t last_input)
const struct retro_keybind *binds_auto = NULL; const struct retro_keybind *binds_auto = NULL;
unsigned max_users = input_driver_max_users; unsigned max_users = input_driver_max_users;
if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())
return input_keys_pressed(settings, last_input);
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
{ {
struct retro_keybind *auto_binds = input_autoconf_binds[i]; struct retro_keybind *auto_binds = input_autoconf_binds[i];

2
retroarch.c
View File

@ -2306,7 +2306,7 @@ static enum runloop_state runloop_check_state(
bool menu_driver_binding_state = menu_driver_is_binding_state(); bool menu_driver_binding_state = menu_driver_is_binding_state();
bool menu_is_alive = menu_driver_is_alive(); bool menu_is_alive = menu_driver_is_alive();
uint64_t current_input = uint64_t current_input =
menu_is_alive ? menu_is_alive && !(settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())?
input_menu_keys_pressed(settings, last_input) : input_menu_keys_pressed(settings, last_input) :
input_keys_pressed(settings, last_input); input_keys_pressed(settings, last_input);
#else #else