mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the two parse_settings functions more alike

Browse Source
This commit is contained in:
twinaphex 2019-04-23 02:51:44 +02:00
parent e4f48fac19
commit 52874b6316
1 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
menu/menu_displaylist.c
View File

@ -1878,16 +1878,10 @@ static int menu_displaylist_parse_settings_internal(
goto loop; goto loop;
} }
if ((flags & SD_FLAG_ADVANCED) && if (!show_advanced_settings)
!show_advanced_settings) if ((flags & SD_FLAG_ADVANCED) || (flags & SD_FLAG_LAKKA_ADVANCED))
goto loop; goto loop;
#ifdef HAVE_LAKKA
if ((flags & SD_FLAG_LAKKA_ADVANCED) &&
!show_advanced_settings)
goto loop;
#endif
if ( if (
(entry_type >= MENU_SETTINGS_INPUT_BEGIN) && (entry_type >= MENU_SETTINGS_INPUT_BEGIN) &&
(entry_type < MENU_SETTINGS_INPUT_END) (entry_type < MENU_SETTINGS_INPUT_END)
@ -1931,12 +1925,16 @@ loop:
(*list = *list + 1); (*list = *list + 1);
} }
if (count == 0 && add_empty_entry) if (count == 0)
{
if (add_empty_entry)
menu_entries_append_enum(info_list, menu_entries_append_enum(info_list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND),
msg_hash_to_str(MENU_ENUM_LABEL_NO_SETTINGS_FOUND), msg_hash_to_str(MENU_ENUM_LABEL_NO_SETTINGS_FOUND),
MENU_ENUM_LABEL_NO_SETTINGS_FOUND, MENU_ENUM_LABEL_NO_SETTINGS_FOUND,
0, 0, 0); 0, 0, 0);
return -1;
}
return 0; return 0;
} }
@ -1953,6 +1951,7 @@ static int menu_displaylist_parse_settings_internal_enum(
size_t count = 0; size_t count = 0;
uint64_t flags = 0; uint64_t flags = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool show_advanced_settings = settings->bools.menu_show_advanced_settings;
if (!setting) if (!setting)
return -1; return -1;
@ -2086,15 +2085,9 @@ static int menu_displaylist_parse_settings_internal_enum(
goto loop; goto loop;
} }
#ifdef HAVE_LAKKA if (!show_advanced_settings)
if ((flags & SD_FLAG_ADVANCED || flags & SD_FLAG_LAKKA_ADVANCED) && if ((flags & SD_FLAG_ADVANCED) || (flags & SD_FLAG_LAKKA_ADVANCED))
!settings->bools.menu_show_advanced_settings)
goto loop; goto loop;
#else
if (flags & SD_FLAG_ADVANCED &&
!settings->bools.menu_show_advanced_settings)
goto loop;
#endif
menu_entries_append_enum(info_list, short_description, menu_entries_append_enum(info_list, short_description,
name, enum_idx, menu_setting_set_flags(setting), 0, 0); name, enum_idx, menu_setting_set_flags(setting), 0, 0);