From 0092aa84d33aaa512b04476250a706bf11f491a9 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 14 Aug 2019 17:55:14 +0200
Subject: [PATCH] Fix OSK input regression

---
 retroarch.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 5a535c3e4f..1b540bdbfd 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -12261,7 +12261,8 @@ void menu_input_post_iterate(int *ret, unsigned action)
  *
  * 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;
    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);
    }
 
+   if (!display_kb)
    {
       unsigned ids[][2] =
       {
@@ -23132,7 +23134,7 @@ static enum runloop_state runloop_check_state(void)
 
 #ifdef HAVE_MENU
    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
 #endif
       input_keys_pressed(&current_bits);