mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only call sort function at one place

Browse Source
This commit is contained in:
twinaphex 2015-05-12 16:36:41 +02:00
parent 04c0ab70a7
commit 20c4bf49a3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
menu/menu_displaylist.c
View File

@ -195,7 +195,7 @@ static void menu_displaylist_parse_drive_list(file_list_t *list)
#endif #endif
} }
static int menu_displaylist_parse(menu_displaylist_info_t *info) static int menu_displaylist_parse(menu_displaylist_info_t *info, bool *need_sort)
{ {
size_t i, list_size; size_t i, list_size;
bool path_is_compressed, push_dir; bool path_is_compressed, push_dir;
@ -342,7 +342,7 @@ static int menu_displaylist_parse(menu_displaylist_info_t *info)
core_path, display_name, sizeof(display_name))) core_path, display_name, sizeof(display_name)))
menu_list_set_alt_at_offset(info->list, i, display_name); menu_list_set_alt_at_offset(info->list, i, display_name);
} }
menu_list_sort_on_alt(info->list); *need_sort = true;
} }
return 0; return 0;
@ -601,6 +601,7 @@ static int menu_displaylist_parse_core_options(menu_displaylist_info_t *info)
int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
{ {
int ret = 0; int ret = 0;
bool need_sort = false;
bool need_refresh = false; bool need_refresh = false;
bool need_push = false; bool need_push = false;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -647,7 +648,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
case DISPLAYLIST_CONFIG_FILES: case DISPLAYLIST_CONFIG_FILES:
case DISPLAYLIST_CONTENT_HISTORY: case DISPLAYLIST_CONTENT_HISTORY:
menu_list_clear(info->list); menu_list_clear(info->list);
ret = menu_displaylist_parse(info); ret = menu_displaylist_parse(info, &need_sort);
if (ret == 0) if (ret == 0)
{ {
need_refresh = true; need_refresh = true;
@ -666,8 +667,7 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
ret = menu_displaylist_parse_cores(info); ret = menu_displaylist_parse_cores(info);
menu_list_sort_on_alt(info->list); need_sort = true;
need_refresh = true; need_refresh = true;
need_push = true; need_push = true;
break; break;
@ -685,8 +685,8 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
case DISPLAYLIST_DATABASE_QUERY: case DISPLAYLIST_DATABASE_QUERY:
menu_list_clear(info->list); menu_list_clear(info->list);
menu_database_populate_query(info->list, info->path, (info->path_c[0] == '\0') ? NULL : info->path_c); menu_database_populate_query(info->list, info->path, (info->path_c[0] == '\0') ? NULL : info->path_c);
menu_list_sort_on_alt(info->list);
need_sort = true;
need_refresh = true; need_refresh = true;
need_push = true; need_push = true;
strlcpy(info->path, info->path_b, sizeof(info->path)); strlcpy(info->path, info->path_b, sizeof(info->path));
@ -723,6 +723,9 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
break; break;
} }
if (need_sort)
menu_list_sort_on_alt(info->list);
if (need_push) if (need_push)
menu_list_populate_generic(info->list, menu_list_populate_generic(info->list,
info->path, info->label, info->type, need_refresh); info->path, info->label, info->type, need_refresh);