ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2016-01-25 05:58:45 +01:00
parent fd94cbdefe
commit 7a0daf2cef
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
menu/cbs/menu_cbs_ok.c
View File

@ -382,8 +382,10 @@ int action_ok_push_quick_menu(void)
return 0; return 0;
} }
static int rarch_defer_core_wrapper(size_t idx, size_t entry_idx, const char *path, uint32_t hash_label, static int rarch_defer_core_wrapper(size_t idx, size_t entry_idx,
bool is_carchive) const char *path, const char *label,
uint32_t hash_label,
unsigned type, bool is_carchive)
{ {
char menu_path_new[PATH_MAX_LENGTH]; char menu_path_new[PATH_MAX_LENGTH];
const char *menu_path = NULL; const char *menu_path = NULL;
@ -440,8 +442,8 @@ static int rarch_defer_core_wrapper(size_t idx, size_t entry_idx, const char *pa
return ret; return ret;
} }
case 0: case 0:
return generic_action_ok_displaylist_push(path, return generic_action_ok_displaylist_push(path, label, type,
NULL, 0, idx, entry_idx, ACTION_OK_DL_DEFERRED_CORE_LIST); idx, entry_idx, ACTION_OK_DL_DEFERRED_CORE_LIST);
default: default:
break; break;
} }
@ -458,7 +460,10 @@ static int action_ok_file_load_with_detect_core_carchive(
fill_pathname_join_delim(detect_content_path, detect_content_path, path, fill_pathname_join_delim(detect_content_path, detect_content_path, path,
'#', sizeof(detect_content_path)); '#', sizeof(detect_content_path));
return rarch_defer_core_wrapper(idx, entry_idx, path, hash_label, true); type = 0;
label = NULL;
return rarch_defer_core_wrapper(idx, entry_idx, path, label, hash_label, type, true);
} }
static int action_ok_file_load_with_detect_core(const char *path, static int action_ok_file_load_with_detect_core(const char *path,
@ -466,7 +471,10 @@ static int action_ok_file_load_with_detect_core(const char *path,
{ {
uint32_t hash_label = menu_hash_calculate(label); uint32_t hash_label = menu_hash_calculate(label);
return rarch_defer_core_wrapper(idx, entry_idx, path, hash_label, false); type = 0;
label = NULL;
return rarch_defer_core_wrapper(idx, entry_idx, path, label, hash_label, type, false);
} }
@ -1830,7 +1838,6 @@ static int action_ok_load_archive(const char *path,
static int action_ok_load_archive_detect_core(const char *path, static int action_ok_load_archive_detect_core(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
size_t selection;
int ret = 0; int ret = 0;
core_info_list_t *list = NULL; core_info_list_t *list = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -1840,7 +1847,7 @@ static int action_ok_load_archive_detect_core(const char *path,
if (!menu) if (!menu)
return -1; return -1;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &idx))
return false; return false;
runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_LIST_GET, &list); runloop_ctl(RUNLOOP_CTL_CURRENT_CORE_LIST_GET, &list);
@ -1855,12 +1862,13 @@ static int action_ok_load_archive_detect_core(const char *path,
{ {
case -1: case -1:
event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL); event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL);
if (rarch_task_push_content_load_default(NULL, NULL, false, CORE_TYPE_PLAIN, NULL, NULL)) if (rarch_task_push_content_load_default(NULL, NULL,
false, CORE_TYPE_PLAIN, NULL, NULL))
action_ok_push_quick_menu(); action_ok_push_quick_menu();
return -1; return -1;
case 0: case 0:
return generic_action_ok_displaylist_push(path, label, type, return generic_action_ok_displaylist_push(path, label, type,
selection, entry_idx, ACTION_OK_DL_DEFERRED_CORE_LIST); idx, entry_idx, ACTION_OK_DL_DEFERRED_CORE_LIST);
default: default:
break; break;
} }