From 2da1924a579acf8bd10946305e9f28421cb008ca Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 4 Sep 2014 04:10:41 +0200 Subject: [PATCH] Revert "(Menu) Change label detect_core_list to deferred_core_list for consistency" This reverts commit 47d8bd88821c31201c6abb2872880a902f2e3eea. --- frontend/menu/backend/menu_common_backend.c | 4 ++-- frontend/menu/menu_entries.c | 4 ++-- settings_data.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index c5a6531bd4..dc61e16ba0 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -1263,7 +1263,7 @@ static int menu_setting_ok_toggle(unsigned type, } else if ( !strcmp(label, "load_content") || - !strcmp(label, "deferred_core_list") + !strcmp(label, "detect_core_list") ) { menu_entries_push(driver.menu->menu_stack, @@ -1913,7 +1913,7 @@ static int menu_action_ok(const char *dir, menu_entries_push(driver.menu->menu_stack, cat_path, menu_label, type, driver.menu->selection_ptr); } - else if (!strcmp(label, "deferred_core_list") + else if (!strcmp(label, "detect_core_list") && type == MENU_FILE_PLAIN) { const core_info_t *info = NULL; diff --git a/frontend/menu/menu_entries.c b/frontend/menu/menu_entries.c index 30a8736d26..32e597e3f0 100644 --- a/frontend/menu/menu_entries.c +++ b/frontend/menu/menu_entries.c @@ -104,7 +104,7 @@ int menu_entries_push_list(menu_handle_t *menu, file_list_clear(list); add_setting_entry(menu,list,"core_list", 0, setting_data); add_setting_entry(menu,list,"history_list", 0, setting_data); - add_setting_entry(menu,list,"deferred_core_list", 0, setting_data); + add_setting_entry(menu,list,"detect_core_list", 0, setting_data); add_setting_entry(menu,list,"load_content", 0, setting_data); add_setting_entry(menu,list,"core_options", MENU_SETTINGS_CORE_OPTIONS, setting_data); add_setting_entry(menu,list,"core_information", 0, setting_data); @@ -279,7 +279,7 @@ int menu_entries_push_list(menu_handle_t *menu, for (i = 0; i < list_size; i++) { file_list_push(list, info[i].path, "", - MENU_FILE_PLAIN, 0); + MENU_FILE_CORE, 0); file_list_set_alt_at_offset(list, i, info[i].display_name); } diff --git a/settings_data.c b/settings_data.c index a4fe0073fa..e15e5c1e95 100644 --- a/settings_data.c +++ b/settings_data.c @@ -1472,7 +1472,7 @@ rarch_setting_t *setting_data_get_mainmenu(bool regenerate) } if (driver.menu && g_extern.core_info && core_info_list_num_info_files(g_extern.core_info)) { - CONFIG_BOOL(lists[2], "deferred_core_list", "Load Content (Detect Core)", false, "...", "...", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) + CONFIG_BOOL(lists[2], "detect_core_list", "Load Content (Detect Core)", false, "...", "...", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) } CONFIG_BOOL(lists[3], "load_content", "Load Content", false, "...", "...", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) CONFIG_BOOL(lists[4], "core_options", "Core Options", false, "...", "...", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler)