From dcd4d6b42226a148f383025a45af5b3c08a8f209 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 23 Feb 2017 21:32:38 +0100 Subject: [PATCH 1/2] Cleanups --- menu/cbs/menu_cbs_scan.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/menu/cbs/menu_cbs_scan.c b/menu/cbs/menu_cbs_scan.c index 90e82faf1a..7867d31f69 100644 --- a/menu/cbs/menu_cbs_scan.c +++ b/menu/cbs/menu_cbs_scan.c @@ -53,14 +53,10 @@ int action_scan_file(const char *path, enum msg_hash_enums enum_idx = MSG_UNKNOWN; const char *menu_label = NULL; const char *menu_path = NULL; - menu_handle_t *menu = NULL; settings_t *settings = config_get_ptr(); fullpath[0] = '\0'; - if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) - return menu_cbs_exit(); - menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL); fill_pathname_join(fullpath, menu_path, path, sizeof(fullpath)); @@ -80,14 +76,10 @@ int action_scan_directory(const char *path, enum msg_hash_enums enum_idx = MSG_UNKNOWN; const char *menu_label = NULL; const char *menu_path = NULL; - menu_handle_t *menu = NULL; settings_t *settings = config_get_ptr(); fullpath[0] = '\0'; - if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) - return menu_cbs_exit(); - menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL); strlcpy(fullpath, menu_path, sizeof(fullpath)); From b8e68030d04c319ed06e49f70b7e5c8736e96489 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 23 Feb 2017 21:35:06 +0100 Subject: [PATCH 2/2] (menu_cbs_ok.c) Cleanups --- menu/cbs/menu_cbs_ok.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 0d37e9ce66..9a77e0ab00 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -250,8 +250,6 @@ int generic_action_ok_displaylist_push(const char *path, settings_t *settings = config_get_ptr(); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); - if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) - return menu_cbs_exit(); new_path_tmp[0] = tmp[0] = parent_dir[0] = action_path[0] = '\0'; @@ -283,6 +281,9 @@ int generic_action_ok_displaylist_push(const char *path, dl_type = DISPLAYLIST_GENERIC; break; case ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE: + if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) + return menu_cbs_exit(); + if (menu) { menu_path = menu->scratch2_buf; @@ -2128,8 +2129,8 @@ static int action_ok_deferred_list_stub(const char *path, static int action_ok_load_core_deferred(const char *path, const char *label, unsigned type, size_t idx, size_t entry_idx) { - content_ctx_info_t content_info = {0}; menu_handle_t *menu = NULL; + content_ctx_info_t content_info = {0}; if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) return menu_cbs_exit();