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

Merge pull request #2517 from lakkatv/master 

(Menu) Fix a regression in menu_displaylist_parse_settings
This commit is contained in:
Twinaphex 2015-12-04 01:02:58 +01:00
parent d8b9be9349 a6d4e596bb
commit 85f62ca1d2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/menu_displaylist.c
View File

@ -1559,6 +1559,7 @@ int menu_displaylist_parse_settings(void *data, menu_displaylist_info_t *info,
switch (type) switch (type)
{ {
case ST_GROUP: case ST_GROUP:
case ST_END_GROUP:
case ST_SUB_GROUP: case ST_SUB_GROUP:
case ST_END_SUB_GROUP: case ST_END_SUB_GROUP:
goto loop; goto loop;
@ -1633,7 +1634,7 @@ loop:
menu_settings_list_increment(&setting); menu_settings_list_increment(&setting);
} }
if (count <= 1 && add_empty_entry) if (count == 0 && add_empty_entry)
menu_entries_push(info->list, menu_entries_push(info->list,
menu_hash_to_str(MENU_LABEL_VALUE_NO_SETTINGS_FOUND), menu_hash_to_str(MENU_LABEL_VALUE_NO_SETTINGS_FOUND),
menu_hash_to_str(MENU_LABEL_NO_SETTINGS_FOUND), menu_hash_to_str(MENU_LABEL_NO_SETTINGS_FOUND),