mirror of
https://github.com/libretro/RetroArch
synced 2025-04-09 21:45:45 +00:00
Merge pull request #5955 from fr500/master
fix menu toggle with keymapper active
This commit is contained in:
commit
29ad88e09c
@ -30,6 +30,7 @@
|
|||||||
#include <compat/posix_string.h>
|
#include <compat/posix_string.h>
|
||||||
#include <retro_miscellaneous.h>
|
#include <retro_miscellaneous.h>
|
||||||
#include <libretro.h>
|
#include <libretro.h>
|
||||||
|
#include "menu/menu_driver.h"
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "../config.h"
|
#include "../config.h"
|
||||||
@ -81,11 +82,12 @@ void input_mapper_poll(input_mapper_t *handle)
|
|||||||
int i;
|
int i;
|
||||||
settings_t *settings = config_get_ptr();
|
settings_t *settings = config_get_ptr();
|
||||||
unsigned device = settings->uints.input_libretro_device[handle->port];
|
unsigned device = settings->uints.input_libretro_device[handle->port];
|
||||||
|
bool menu_is_alive = menu_driver_is_alive();
|
||||||
|
|
||||||
device &= RETRO_DEVICE_MASK;
|
device &= RETRO_DEVICE_MASK;
|
||||||
|
|
||||||
/* for now we only handle keyboard inputs */
|
/* for now we only handle keyboard inputs */
|
||||||
if (device != RETRO_DEVICE_KEYBOARD)
|
if (device != RETRO_DEVICE_KEYBOARD || menu_is_alive)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
memset(handle->keys, 0, sizeof(handle->keys));
|
memset(handle->keys, 0, sizeof(handle->keys));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user