mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5955 from fr500/master

Browse Source 
fix menu toggle with keymapper active
This commit is contained in:
Twinaphex 2017-12-26 09:40:08 +01:00 committed by GitHub
commit 29ad88e09c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input_mapper.c
View File

@ -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));