CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-22 10:49:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Initialize libretro_input_binds inside input_driver_init

Browse Source
This commit is contained in:
twinaphex 2017-01-11 23:32:33 +01:00
parent ca5bdab881
commit 73a5e54ca8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/input_driver.c
View File

@ -383,7 +383,7 @@ int16_t input_state(unsigned port, unsigned device,
{
if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD)))
{
bool bind_valid = libretro_input_binds[port][id].valid;
bool bind_valid = libretro_input_binds[port] && libretro_input_binds[port][id].valid;
if (device == RETRO_DEVICE_KEYBOARD)
bind_valid = true;
@ -964,11 +964,12 @@ void input_driver_poll(void)
bool input_driver_init(void)
{
unsigned i;
settings_t *settings = config_get_ptr();
for (i = 0; i < settings->input.max_users; i++)
libretro_input_binds[i] = settings->input.binds[i];
if (current_input)
{
settings_t *settings = config_get_ptr();
current_input_data = current_input->init(settings->input.joypad_driver);
}
if (!current_input_data)
return false;