mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-16 08:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Get rid of SL_FLAG_ALLOW_EMPTY_LIST"

Browse Source 
This reverts commit bb0b8764c5fce1d385abd315532fe3c4d9550e2c.
This commit is contained in:
twinaphex 2016-02-06 21:33:45 +01:00
parent 788ded0138
commit 05d9827830
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/xmb.c
View File

@ -1032,7 +1032,7 @@ static void xmb_init_horizontal_list(xmb_handle_t *xmb)
info.menu_list = NULL; info.menu_list = NULL;
info.type = 0; info.type = 0;
info.type_default = MENU_FILE_PLAIN; info.type_default = MENU_FILE_PLAIN;
info.flags = SL_FLAG_ALLOW_EMPTY_LIST;
strlcpy(info.label, strlcpy(info.label,
menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST), menu_hash_to_str(MENU_LABEL_CONTENT_COLLECTION_LIST),
sizeof(info.label)); sizeof(info.label));

18
menu/menu_displaylist.c
View File

@ -2261,9 +2261,12 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool ho
if (list_size == 0) if (list_size == 0)
{ {
menu_entries_push(info->list, if (!(info->flags & SL_FLAG_ALLOW_EMPTY_LIST))
menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS), {
"", MENU_SETTING_NO_ITEM, 0, 0); menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
"", MENU_SETTING_NO_ITEM, 0, 0);
}
string_list_free(str_list); string_list_free(str_list);
@ -2395,9 +2398,12 @@ static int menu_displaylist_parse_generic(menu_displaylist_info_t *info, bool ho
case MENU_LABEL_CORE_LIST: case MENU_LABEL_CORE_LIST:
if (items_found == 0) if (items_found == 0)
{ {
menu_entries_push(info->list, if (!(info->flags & SL_FLAG_ALLOW_EMPTY_LIST))
menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS), {
"", MENU_SETTING_NO_ITEM, 0, 0); menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_NO_ITEMS),
"", MENU_SETTING_NO_ITEM, 0, 0);
}
return 0; return 0;
} }

3
menu/menu_setting.h
View File

@ -95,7 +95,8 @@ enum setting_list_flags
SL_FLAG_SETTINGS_LOGGING_OPTIONS = (1 << 27), SL_FLAG_SETTINGS_LOGGING_OPTIONS = (1 << 27),
SL_FLAG_SETTINGS_SAVING_OPTIONS = (1 << 28), SL_FLAG_SETTINGS_SAVING_OPTIONS = (1 << 28),
SL_FLAG_SETTINGS_SUB_ACCOUNTS_OPTIONS = (1 << 29), SL_FLAG_SETTINGS_SUB_ACCOUNTS_OPTIONS = (1 << 29),
SL_FLAG_SETTINGS_ALL = (1 << 30) SL_FLAG_SETTINGS_ALL = (1 << 30),
SL_FLAG_ALLOW_EMPTY_LIST = (1 << 31)
}; };
typedef struct rarch_setting_group_info rarch_setting_group_info_t; typedef struct rarch_setting_group_info rarch_setting_group_info_t;