Fix OSK input regression

This commit is contained in:
twinaphex 2019-08-14 17:55:14 +02:00
parent 9271f73dd2
commit 0092aa84d3
1 changed files with 4 additions and 2 deletions

View File

@ -12261,7 +12261,8 @@ void menu_input_post_iterate(int *ret, unsigned action)
* *
* Returns: Input sample containing a mask of all pressed keys. * Returns: Input sample containing a mask of all pressed keys.
*/ */
static void input_menu_keys_pressed(input_bits_t *p_new_state) static void input_menu_keys_pressed(input_bits_t *p_new_state,
bool display_kb)
{ {
unsigned i, port; unsigned i, port;
rarch_joypad_info_t joypad_info; rarch_joypad_info_t joypad_info;
@ -12330,6 +12331,7 @@ static void input_menu_keys_pressed(input_bits_t *p_new_state)
input_pop_analog_dpad(auto_binds); input_pop_analog_dpad(auto_binds);
} }
if (!display_kb)
{ {
unsigned ids[][2] = unsigned ids[][2] =
{ {
@ -23132,7 +23134,7 @@ static enum runloop_state runloop_check_state(void)
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (menu_is_alive && !(settings->bools.menu_unified_controls && !display_kb)) if (menu_is_alive && !(settings->bools.menu_unified_controls && !display_kb))
input_menu_keys_pressed(&current_bits); input_menu_keys_pressed(&current_bits, display_kb);
else else
#endif #endif
input_keys_pressed(&current_bits); input_keys_pressed(&current_bits);