Merge pull request #17898 from zoltanvb/core_options_reset_v2b

This commit is contained in:
LibretroAdmin 2025-05-14 06:54:28 +02:00 committed by GitHub
commit 4f22a04436
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 35 additions and 31 deletions

View File

@ -10731,6 +10731,8 @@ unsigned menu_displaylist_build_list(
} }
break; break;
case DISPLAYLIST_CONFIGURATIONS_LIST: case DISPLAYLIST_CONFIGURATIONS_LIST:
{
rarch_system_info_t *sys_info = &runloop_state_get_ptr()->system;
if (menu_entries_append(list, if (menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONFIGURATIONS),
msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS), msg_hash_to_str(MENU_ENUM_LABEL_CONFIGURATIONS),
@ -10755,13 +10757,15 @@ unsigned menu_displaylist_build_list(
MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG, MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG,
MENU_SETTING_ACTION, 0, 0, NULL)) MENU_SETTING_ACTION, 0, 0, NULL))
count++; count++;
if (!settings->bools.global_core_options && menu_entries_append(list, if (!settings->bools.global_core_options && !string_is_empty(sys_info->info.library_name)
&& menu_entries_append(list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_OPTIONS_RESET), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_OPTIONS_RESET),
"", "",
MENU_ENUM_LABEL_CORE_OPTIONS_RESET, MENU_ENUM_LABEL_CORE_OPTIONS_RESET,
MENU_SETTING_ACTION_CORE_OPTIONS_RESET, 0, 0, NULL)) MENU_SETTING_ACTION_CORE_OPTIONS_RESET, 0, 0, NULL))
count++; count++;
break; break;
}
case DISPLAYLIST_PRIVACY_SETTINGS_LIST: case DISPLAYLIST_PRIVACY_SETTINGS_LIST:
{ {
menu_displaylist_build_info_t build_list[] = { menu_displaylist_build_info_t build_list[] = {