mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-09-06 19:29:04 +02:00
parent 3a75180866
commit 821abdb471
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/cbs/menu_cbs_deferred_push.c
View File

@ -53,16 +53,6 @@ static int deferred_push_help(menu_displaylist_info_t *info)
static int deferred_push_rdb_entry_detail(menu_displaylist_info_t *info) static int deferred_push_rdb_entry_detail(menu_displaylist_info_t *info)
{ {
struct string_list *str_list = string_split(info->label, "|");
if (!str_list)
return -1;
strlcpy(info->path_b, str_list->elems[1].data, sizeof(info->path_b));
strlcpy(info->label, str_list->elems[0].data, sizeof(info->label));
string_list_free(str_list);
return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_ENTRY); return menu_displaylist_push_list(info, DISPLAYLIST_DATABASE_ENTRY);
} }
@ -446,12 +436,6 @@ int deferred_push_content_list(void *data, void *userdata, const char *path,
static int deferred_push_database_manager_list(menu_displaylist_info_t *info) static int deferred_push_database_manager_list(menu_displaylist_info_t *info)
{ {
settings_t *settings = config_get_ptr();
info->type_default = MENU_FILE_RDB;
strlcpy(info->exts, "rdb", sizeof(info->exts));
strlcpy(info->path, settings->content_database, sizeof(info->path));
return menu_displaylist_push_list(info, DISPLAYLIST_DATABASES); return menu_displaylist_push_list(info, DISPLAYLIST_DATABASES);
} }

22
menu/menu_displaylist.c
View File

@ -2524,6 +2524,17 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
need_push = true; need_push = true;
break; break;
case DISPLAYLIST_DATABASE_ENTRY: case DISPLAYLIST_DATABASE_ENTRY:
{
struct string_list *str_list = string_split(info->label, "|");
if (!str_list)
return -1;
strlcpy(info->path_b, str_list->elems[1].data, sizeof(info->path_b));
strlcpy(info->label, str_list->elems[0].data, sizeof(info->label));
string_list_free(str_list);
}
ret = menu_displaylist_parse_database_entry(info); ret = menu_displaylist_parse_database_entry(info);
need_push = true; need_push = true;
@ -2735,12 +2746,21 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
MENU_SETTINGS_CORE_OPTION_NONE, 0, 0); MENU_SETTINGS_CORE_OPTION_NONE, 0, 0);
need_push = true; need_push = true;
break; break;
case DISPLAYLIST_DATABASES:
info->type_default = MENU_FILE_RDB;
strlcpy(info->exts, "rdb", sizeof(info->exts));
strlcpy(info->path, settings->content_database, sizeof(info->path));
if (menu_displaylist_parse_generic(info, &need_sort) == 0)
{
need_refresh = true;
need_push = true;
}
break;
case DISPLAYLIST_DEFAULT: case DISPLAYLIST_DEFAULT:
case DISPLAYLIST_CORES: case DISPLAYLIST_CORES:
case DISPLAYLIST_CORES_DETECTED: case DISPLAYLIST_CORES_DETECTED:
case DISPLAYLIST_SHADER_PASS: case DISPLAYLIST_SHADER_PASS:
case DISPLAYLIST_SHADER_PRESET: case DISPLAYLIST_SHADER_PRESET:
case DISPLAYLIST_DATABASES:
case DISPLAYLIST_DATABASE_CURSORS: case DISPLAYLIST_DATABASE_CURSORS:
case DISPLAYLIST_DATABASE_PLAYLISTS: case DISPLAYLIST_DATABASE_PLAYLISTS:
case DISPLAYLIST_VIDEO_FILTERS: case DISPLAYLIST_VIDEO_FILTERS: