From 0cc83fe8fe7688e2cc331ba99487513887863c10 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 19 Oct 2015 03:38:35 +0200 Subject: [PATCH] Cleanups --- menu/menu_displaylist.c | 2 +- menu/menu_setting.c | 19 +++++++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 16c302612b..0c07c47970 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -2349,7 +2349,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) need_push = true; break; case DISPLAYLIST_MAIN_MENU: - ret = menu_displaylist_parse_settings(menu, info, info->label, PARSE_NONE); + ret = menu_displaylist_parse_settings(menu, info, menu_hash_to_str(MENU_VALUE_MAIN_MENU), PARSE_NONE); need_push = true; break; case DISPLAYLIST_SETTINGS_ALL: diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 2dac33fca9..9fe9f6b6ab 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -2825,23 +2825,18 @@ static bool setting_append_list_main_menu_options( rarch_setting_group_info_t group_info = {0}; rarch_setting_group_info_t subgroup_info = {0}; settings_t *settings = config_get_ptr(); - global_t *global = global_get_ptr(); - const char *main_menu = menu_hash_to_str(MENU_VALUE_MAIN_MENU); (void)settings; - START_GROUP(group_info,main_menu, parent_group); + START_GROUP(group_info, menu_hash_to_str(MENU_VALUE_MAIN_MENU), parent_group); START_SUB_GROUP(list, list_info, "State", group_info.name, subgroup_info, parent_group); - if (global->inited.main && (global->inited.core.type != CORE_TYPE_DUMMY)) - { - CONFIG_ACTION( - menu_hash_to_str(MENU_LABEL_CONTENT_SETTINGS), - menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_SETTINGS), - group_info.name, - subgroup_info.name, - parent_group); - } + CONFIG_ACTION( + menu_hash_to_str(MENU_LABEL_CONTENT_SETTINGS), + menu_hash_to_str(MENU_LABEL_VALUE_CONTENT_SETTINGS), + group_info.name, + subgroup_info.name, + parent_group); #if defined(HAVE_DYNAMIC) || defined(HAVE_LIBRETRO_MANAGEMENT) CONFIG_ACTION(