diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index f6c76b3bbe..eb560f9fdb 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -458,7 +458,8 @@ static int action_ok_audio_dsp_plugin(const char *path, info.type = 0; info.directory_ptr = idx; strlcpy(info.path, settings->audio.filter_dir, sizeof(info.path)); - strlcpy(info.label, "audio_dsp_plugin", sizeof(info.label)); + strlcpy(info.label, + menu_hash_to_str(MENU_LABEL_AUDIO_DSP_PLUGIN), sizeof(info.label)); return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC); } @@ -477,7 +478,8 @@ static int action_ok_video_filter(const char *path, info.type = 0; info.directory_ptr = idx; strlcpy(info.path, settings->video.filter_dir, sizeof(info.path)); - strlcpy(info.label, "deferred_video_filter", sizeof(info.label)); + strlcpy(info.label, + menu_hash_to_str(MENU_LABEL_DEFERRED_VIDEO_FILTER), sizeof(info.label)); return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC); } @@ -513,7 +515,8 @@ static int action_ok_core_updater_list(const char *path, info.type = type; info.directory_ptr = idx; strlcpy(info.path, path, sizeof(info.path)); - strlcpy(info.label, "deferred_core_updater_list", sizeof(info.label)); + strlcpy(info.label, + menu_hash_to_str(MENU_LABEL_DEFERRED_CORE_UPDATER_LIST), sizeof(info.label)); return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC); } @@ -1049,7 +1052,9 @@ static int action_ok_database_manager_list(const char *path, info.type = 0; info.directory_ptr = idx; strlcpy(info.path, rdb_path, sizeof(info.path)); - strlcpy(info.label, "deferred_database_manager_list", sizeof(info.label)); + strlcpy(info.label, + menu_hash_to_str(MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST), + sizeof(info.label)); return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC); } @@ -1072,7 +1077,9 @@ static int action_ok_cursor_manager_list(const char *path, info.type = 0; info.directory_ptr = idx; strlcpy(info.path, cursor_path, sizeof(info.path)); - strlcpy(info.label, "deferred_cursor_manager_list", sizeof(info.label)); + strlcpy(info.label, + menu_hash_to_str(MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST), + sizeof(info.label)); return menu_displaylist_push_list(&info, DISPLAYLIST_GENERIC); } @@ -1396,7 +1403,9 @@ static int action_ok_rdb_entry_submenu(const char *path, string_list_join_concat(rdb, len, str_list2, "|"); - strlcpy(new_label, "deferred_cursor_manager_list_", sizeof(new_label)); + strlcpy(new_label, menu_hash_to_str(MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST), + sizeof(new_label)); + strlcat(new_label, "_", sizeof(new_label)); strlcat(new_label, str_list->elems[0].data, sizeof(new_label)); info.list = menu_list->menu_stack; @@ -1422,7 +1431,9 @@ static int action_ok_help(const char *path, return -1; info.list = menu_list->menu_stack; - strlcpy(info.label, "help", sizeof(info.label)); + strlcpy(info.label, + menu_hash_to_str(MENU_LABEL_HELP), + sizeof(info.label)); return menu_displaylist_push_list(&info, DISPLAYLIST_HELP); } diff --git a/menu/menu_hash.c b/menu/menu_hash.c index 906707da24..a862685e75 100644 --- a/menu/menu_hash.c +++ b/menu/menu_hash.c @@ -71,8 +71,12 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "core_options"; case MENU_LABEL_DATABASE_MANAGER_LIST: return "database_manager_list"; + case MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST: + return "deferred_database_manager_list"; case MENU_LABEL_CURSOR_MANAGER_LIST: return "cursor_manager_list"; + case MENU_LABEL_DEFERRED_CURSOR_MANAGER_LIST: + return "deferred_cursor_manager_list"; case MENU_LABEL_FRONTEND_COUNTERS: return "frontend_counters"; case MENU_LABEL_CORE_COUNTERS: @@ -121,8 +125,10 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "Settings"; case MENU_LABEL_QUIT_RETROARCH: return "Quit RetroArch"; - case MENU_LABEL_HELP: + case MENU_LABEL_VALUE_HELP: return "Help"; + case MENU_LABEL_HELP: + return "help"; case MENU_LABEL_SAVE_NEW_CONFIG: return "Save New Config"; case MENU_LABEL_RESTART_CONTENT: @@ -209,6 +215,12 @@ static const char *menu_hash_to_str_english(uint32_t hash) return "shader_options"; case MENU_LABEL_VALUE_NO_SHADER_PARAMETERS: return "No shader parameters."; + case MENU_LABEL_DEFERRED_VIDEO_FILTER: + return "deferred_video_filter"; + case MENU_LABEL_DEFERRED_CORE_UPDATER_LIST: + return "deferred_core_updater_list"; + case MENU_LABEL_AUDIO_DSP_PLUGIN: + return "audio_dsp_plugin"; default: break; } diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 4e69f55cd2..d2e0952863 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -310,6 +310,7 @@ extern "C" { #define MENU_LABEL_CUSTOM_VIEWPORT_1 0x76c3016fU #define MENU_LABEL_CUSTOM_VIEWPORT_2 0x76c30170U #define MENU_LABEL_HELP 0x7c97d2eeU +#define MENU_LABEL_VALUE_HELP 0x7c8646ceU #define MENU_LABEL_INPUT_OVERLAY 0x24e24796U #define MENU_LABEL_INPUT_OSK_OVERLAY 0x11f1c582U #define MENU_LABEL_CHEAT_DATABASE_PATH 0x01388b8aU diff --git a/menu/menu_setting.c b/menu/menu_setting.c index e4fa493295..418430a950 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3725,8 +3725,8 @@ static bool setting_append_list_main_menu_options( menu_settings_list_current_add_cmd(list, list_info, EVENT_CMD_MENU_SAVE_CONFIG); CONFIG_ACTION( - "help", menu_hash_to_str(MENU_LABEL_HELP), + menu_hash_to_str(MENU_LABEL_VALUE_HELP), group_info.name, subgroup_info.name, parent_group);