From 7d9193555a0c685f63cbf18a8b36b7e174382b2a Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Tue, 26 Dec 2017 01:20:36 -0500
Subject: [PATCH] fix menu toggle with keymapper active

---
 input/input_mapper.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/input/input_mapper.c b/input/input_mapper.c
index decfea1716..ee012cfbf6 100644
--- a/input/input_mapper.c
+++ b/input/input_mapper.c
@@ -30,6 +30,7 @@
 #include <compat/posix_string.h>
 #include <retro_miscellaneous.h>
 #include <libretro.h>
+#include "menu/menu_driver.h"
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -81,11 +82,12 @@ void input_mapper_poll(input_mapper_t *handle)
    int i;
    settings_t *settings = config_get_ptr();
    unsigned device      = settings->uints.input_libretro_device[handle->port];
+   bool menu_is_alive   = menu_driver_is_alive();
 
    device              &= RETRO_DEVICE_MASK;
 
    /* for now we only handle keyboard inputs */
-   if (device != RETRO_DEVICE_KEYBOARD)
+   if (device != RETRO_DEVICE_KEYBOARD || menu_is_alive)
       return;
 
    memset(handle->keys, 0, sizeof(handle->keys));