From e067dac2a46f99a7ee78a9f7080ffa66ddc2e059 Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Sat, 8 Jul 2017 17:39:29 -0400
Subject: [PATCH] fix keyboard regression with mupen cores

---
 input/drivers/x11_input.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c
index c6fb1f956c..eeadfb5456 100644
--- a/input/drivers/x11_input.c
+++ b/input/drivers/x11_input.c
@@ -231,7 +231,7 @@ static int16_t x_input_state(void *data,
          {
             int keycode = XKeysymToKeycode(x11->display,
                   rarch_keysym_lut[(enum retro_key)binds[port][id].key]);
-            ret         = x11->state[keycode >> 3] & (1 << (keycode & 7));
+            ret         = (binds[port][id].key < RETROK_LAST) && (x11->state[keycode >> 3] & (1 << (keycode & 7)));
             if (!ret)
                ret      = input_joypad_pressed(x11->joypad,
                      joypad_info, port, binds[port], id);