mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:libretro/RetroArch

Browse Source
This commit is contained in:
radius 2015-07-12 15:30:09 -05:00
commit 39e15c983b
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
input/input_autodetect.c
View File

@ -130,10 +130,10 @@ static void input_autoconfigure_joypad_add(
settings->input.autoconf_binds[params->idx]); settings->input.autoconf_binds[params->idx]);
if (buf[0] != '\0' || strcmp(buf, "")) if (buf[0] != '\0' || strcmp(buf, ""))
snprintf(msg, sizeof(msg), "%s configured in port #%u", snprintf(msg, sizeof(msg), "%s configured in port #%u.",
buf, params->idx); buf, params->idx);
else else
snprintf(msg, sizeof(msg), "%s configured in port #%u", snprintf(msg, sizeof(msg), "%s configured in port #%u.",
params->name, params->idx); params->name, params->idx);
if (!block_osd_spam) if (!block_osd_spam)

7
menu/menu_displaylist.c
View File

@ -1768,13 +1768,6 @@ static int menu_displaylist_parse_options(menu_displaylist_info_t *info)
menu_hash_to_str(MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES), menu_hash_to_str(MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES),
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_HID
menu_list_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES_HID),
menu_hash_to_str(MENU_LABEL_UPDATE_AUTOCONFIG_PROFILES_HID),
MENU_SETTING_ACTION, 0, 0);
#endif
menu_list_push(info->list, menu_list_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CHEATS), menu_hash_to_str(MENU_LABEL_VALUE_UPDATE_CHEATS),
menu_hash_to_str(MENU_LABEL_UPDATE_CHEATS), menu_hash_to_str(MENU_LABEL_UPDATE_CHEATS),