mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-09-04 23:24:14 +02:00
parent c98a372d30
commit f3c24ace43
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menu/cbs/menu_cbs_ok.c
View File

@ -84,6 +84,7 @@ static int generic_action_ok_displaylist_push(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,
unsigned action_type) unsigned action_type)
{ {
char action_path[PATH_MAX_LENGTH];
unsigned dl_type = DISPLAYLIST_GENERIC; unsigned dl_type = DISPLAYLIST_GENERIC;
menu_displaylist_info_t info = {0}; menu_displaylist_info_t info = {0};
const char *menu_label = NULL; const char *menu_label = NULL;
@ -100,6 +101,8 @@ static int generic_action_ok_displaylist_push(const char *path,
menu_list_get_last_stack(menu_list, menu_list_get_last_stack(menu_list,
&menu_path, &menu_label, NULL, NULL); &menu_path, &menu_label, NULL, NULL);
fill_pathname_join(action_path, menu_path, path, sizeof(action_path));
switch (action_type) switch (action_type)
{ {
case ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE: case ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE:
@ -285,20 +288,14 @@ static int generic_action_ok_displaylist_push(const char *path,
strlcpy(menu->scratch2_buf, menu_path, sizeof(menu->scratch2_buf)); strlcpy(menu->scratch2_buf, menu_path, sizeof(menu->scratch2_buf));
break; break;
case ACTION_OK_DL_DIRECTORY_PUSH: case ACTION_OK_DL_DIRECTORY_PUSH:
{ info.type = type;
char cat_path[PATH_MAX_LENGTH] = {0}; info.directory_ptr = idx;
strlcpy(info.path, action_path, sizeof(info.path));
fill_pathname_join(cat_path, menu_path, path, sizeof(cat_path)); strlcpy(info.label, menu_label, sizeof(info.label));
info.type = type;
info.directory_ptr = idx;
strlcpy(info.path, cat_path, sizeof(info.path));
strlcpy(info.label, menu_label, sizeof(info.label));
}
break; break;
case ACTION_OK_DL_DATABASE_MANAGER_LIST: case ACTION_OK_DL_DATABASE_MANAGER_LIST:
{ {
char rdb_path[PATH_MAX_LENGTH] = {0}; char rdb_path[PATH_MAX_LENGTH];
fill_pathname_join(rdb_path, settings->content_database, fill_pathname_join(rdb_path, settings->content_database,
path, sizeof(rdb_path)); path, sizeof(rdb_path));
@ -313,7 +310,7 @@ static int generic_action_ok_displaylist_push(const char *path,
break; break;
case ACTION_OK_DL_CURSOR_MANAGER_LIST: case ACTION_OK_DL_CURSOR_MANAGER_LIST:
{ {
char cursor_path[PATH_MAX_LENGTH] = {0}; char cursor_path[PATH_MAX_LENGTH];
fill_pathname_join(cursor_path, settings->cursor_directory, fill_pathname_join(cursor_path, settings->cursor_directory,
path, sizeof(cursor_path)); path, sizeof(cursor_path));
@ -605,8 +602,7 @@ static int generic_action_ok(const char *path,
case ACTION_OK_LOAD_CORE: case ACTION_OK_LOAD_CORE:
flush_char = NULL; flush_char = NULL;
flush_type = MENU_SETTINGS; flush_type = MENU_SETTINGS;
fill_pathname_join(settings->libretro, menu_path, path, strlcpy(settings->libretro, action_path, sizeof(settings->libretro));
sizeof(settings->libretro));
event_command(EVENT_CMD_LOAD_CORE); event_command(EVENT_CMD_LOAD_CORE);
#if defined(HAVE_DYNAMIC) #if defined(HAVE_DYNAMIC)