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

Merge pull request #5419 from fr500/master 

always show the controls menu, we should prune the entries inside ins…
This commit is contained in:
Twinaphex 2017-09-09 23:28:58 +02:00 committed by GitHub
parent 750621e28c e9d5413084
commit a38a9c643e
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/menu_displaylist.c
View File

@ -2894,12 +2894,11 @@ static int menu_displaylist_parse_load_content_settings(
MENU_SETTING_ACTION, 0, 0); MENU_SETTING_ACTION, 0, 0);
#endif #endif
if (core_has_set_input_descriptor()) menu_entries_append_enum(info->list,
menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS),
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS), msg_hash_to_str(MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS),
msg_hash_to_str(MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS), MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS,
MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS, MENU_SETTING_ACTION, 0, 0);
MENU_SETTING_ACTION, 0, 0);
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA
if (show_advanced_settings) if (show_advanced_settings)