From 7f0ac2565aa7658be0f7350bb23db19db1d7c28b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 26 Jan 2015 06:08:18 +0100 Subject: [PATCH] Refactor deferred_push_content_actions --- menu/menu_entries.c | 12 ++++++++---- menu/menu_entries_cbs.c | 15 +-------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/menu/menu_entries.c b/menu/menu_entries.c index 3136df1cab..e44aa17e11 100644 --- a/menu/menu_entries.c +++ b/menu/menu_entries.c @@ -102,7 +102,8 @@ static void menu_entries_content_list_push( if (!info) return; - str_list = (struct string_list*)dir_list_new(path, info->supported_extensions, true); + str_list = (struct string_list*)dir_list_new(path, + info->supported_extensions, true); dir_list_sort(str_list, true); @@ -112,7 +113,8 @@ static void menu_entries_content_list_push( for (j = 0; j < num_items; j++) { if (str_list->elems[j].attr.i == RARCH_DIRECTORY) - menu_entries_content_list_push(list, info, str_list->elems[j].data); + menu_entries_content_list_push(list, info, + str_list->elems[j].data); else menu_list_push( list, @@ -146,7 +148,8 @@ int menu_entries_push_horizontal_menu_list(menu_handle_t *menu, return -1; if (!info->supports_no_game) - menu_entries_content_list_push(list, info, g_settings.content_directory); + menu_entries_content_list_push(list, info, + g_settings.content_directory); else menu_list_push( list, @@ -164,7 +167,8 @@ int menu_entries_push_horizontal_menu_list(menu_handle_t *menu, { struct string_list *strlist = info->databases_list; - fill_pathname_join(db_path, g_settings.content_database, strlist->elems[i].data, sizeof(db_path)); + fill_pathname_join(db_path, g_settings.content_database, + strlist->elems[i].data, sizeof(db_path)); strlcat(db_path, ".rdb", sizeof(db_path)); if (path_file_exists(db_path)) diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c index a89c98131a..3439892246 100644 --- a/menu/menu_entries_cbs.c +++ b/menu/menu_entries_cbs.c @@ -2399,20 +2399,7 @@ static int deferred_push_content_actions(void *data, void *userdata, static int deferred_push_content_list(void *data, void *userdata, const char *path, const char *label, unsigned type) { - file_list_t *list = (file_list_t*)data; - - (void)userdata; - - if (!list || !driver.menu) - return -1; - - menu_navigation_clear(driver.menu, true); - if (driver.menu->cat_selection_ptr == 0) - return menu_entries_push_list(driver.menu, driver.menu->menu_list->selection_buf, - "", "Main Menu", 0, SL_FLAG_MAIN_MENU); - else - return menu_entries_push_horizontal_menu_list(driver.menu, driver.menu->menu_list->selection_buf, - "", "Horizontal Menu", 0); + return menu_entries_deferred_push(data, driver.menu->menu_list->selection_buf); } static int deferred_push_database_manager_list(void *data, void *userdata,