Merge pull request #6028 from fr500/master

show the menu entries when no achievements found even if hardcore mod…
This commit is contained in:
Twinaphex 2018-01-02 06:10:51 +01:00 committed by GitHub
commit fddcf2b204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2588,7 +2588,7 @@ static int menu_displaylist_parse_load_content_settings(
}
if (settings->bools.quick_menu_show_save_load_state &&
! settings->bools.cheevos_hardcore_mode_enable)
!(settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded))
{
menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_STATE_SLOT, PARSE_ONLY_INT, true);
@ -2608,7 +2608,7 @@ static int menu_displaylist_parse_load_content_settings(
if (settings->bools.quick_menu_show_save_load_state &&
settings->bools.quick_menu_show_undo_save_load_state &&
! settings->bools.cheevos_hardcore_mode_enable)
!(settings->bools.cheevos_hardcore_mode_enable && cheevos_loaded))
{
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE),