libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

Merge pull request #6590 from fr500/master

Browse Source 
fix #6589
This commit is contained in:
Twinaphex 2018-04-17 05:24:49 +02:00 committed by GitHub
commit 919a441089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
menu/menu_displaylist.c
View File

@ -3278,7 +3278,6 @@ static int menu_displaylist_parse_options_remappings(
if (device == RETRO_DEVICE_JOYPAD || device == RETRO_DEVICE_ANALOG)
{
/* change to RARCH_FIRST_CUSTOM_BIND + 8 once analog remapping is implemented */
for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND + 8; retro_id++)
{
char desc_label[64];
@ -3308,19 +3307,7 @@ static int menu_displaylist_parse_options_remappings(
(p * (RARCH_FIRST_CUSTOM_BIND + 8)) + retro_id, 0, 0);
}
}
}
}
if (system)
{
settings_t *settings = config_get_ptr();
unsigned device;
for (p = 0; p < MAX_USERS; p++)
{
device = settings->uints.input_libretro_device[p];
device &= RETRO_DEVICE_MASK;
if (device == RETRO_DEVICE_KEYBOARD)
else if (device == RETRO_DEVICE_KEYBOARD)
{
for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
{