ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5258 from fr500/master 

fix #5257
This commit is contained in:
Andrés 2017-08-06 20:03:01 -05:00 committed by GitHub
parent 5d2ab5bf82 7b09cd34db
commit b521236c3e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command.c
View File

@ -1291,7 +1291,8 @@ static void command_event_restore_default_shader_preset(void)
static void command_event_restore_remaps(void) static void command_event_restore_remaps(void)
{ {
input_remapping_set_defaults(); if (rarch_ctl(RARCH_CTL_IS_REMAPS_GAME_ACTIVE, NULL))
input_remapping_set_defaults();
} }
static bool command_event_save_auto_state(void) static bool command_event_save_auto_state(void)

7
input/input_remapping.c
View File

@ -213,7 +213,10 @@ void input_remapping_set_defaults(void)
} }
for (j = 0; j < 4; j++) for (j = 0; j < 4; j++)
settings->uints.input_remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] = j; settings->uints.input_remap_ids[i][RARCH_FIRST_CUSTOM_BIND + j] = j;
settings->uints.input_analog_dpad_mode[i] = old_analog_dpad_mode[i];
settings->uints.input_libretro_device[i] = old_libretro_device[i]; if (old_analog_dpad_mode[i])
settings->uints.input_analog_dpad_mode[i] = old_analog_dpad_mode[i];
if (old_libretro_device[i])
settings->uints.input_libretro_device[i] = old_libretro_device[i];
} }
} }