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

Cleanup menu_displaylist_parse_associations

Browse Source
This commit is contained in:
twinaphex 2016-12-17 12:45:47 +01:00
parent 7312daf0d7
commit 07b4211482
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
menu/menu_displaylist.c
View File

@ -3512,8 +3512,6 @@ static void menu_displaylist_parse_playlist_associations(
menu_displaylist_info_t *info) menu_displaylist_info_t *info)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
struct string_list *stnames = string_split(settings->playlist_names, ";");
struct string_list *stcores = string_split(settings->playlist_cores, ";");
struct string_list *str_list = dir_list_new_special(settings->directory.playlist, struct string_list *str_list = dir_list_new_special(settings->directory.playlist,
DIR_LIST_COLLECTIONS, NULL); DIR_LIST_COLLECTIONS, NULL);
@ -3522,6 +3520,8 @@ static void menu_displaylist_parse_playlist_associations(
unsigned i; unsigned i;
char new_playlist_names[PATH_MAX_LENGTH]; char new_playlist_names[PATH_MAX_LENGTH];
char new_playlist_cores[PATH_MAX_LENGTH]; char new_playlist_cores[PATH_MAX_LENGTH];
struct string_list *stnames = string_split(settings->playlist_names, ";");
struct string_list *stcores = string_split(settings->playlist_cores, ";");
new_playlist_names[0] = new_playlist_cores[0] = '\0'; new_playlist_names[0] = new_playlist_cores[0] = '\0';
@ -3555,7 +3555,7 @@ static void menu_displaylist_parse_playlist_associations(
path_remove_extension(path_base); path_remove_extension(path_base);
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
path_base, path_base,
str_list->elems[i].data, path,
MENU_ENUM_LABEL_PLAYLIST_ENTRY, MENU_ENUM_LABEL_PLAYLIST_ENTRY,
MENU_SETTINGS_PLAYLIST_ASSOCIATION_START + i, MENU_SETTINGS_PLAYLIST_ASSOCIATION_START + i,
0, 0); 0, 0);
@ -3570,11 +3570,12 @@ static void menu_displaylist_parse_playlist_associations(
new_playlist_names, sizeof(settings->playlist_names)); new_playlist_names, sizeof(settings->playlist_names));
strlcpy(settings->playlist_cores, strlcpy(settings->playlist_cores,
new_playlist_cores, sizeof(settings->playlist_cores)); new_playlist_cores, sizeof(settings->playlist_cores));
string_list_free(stnames);
string_list_free(stcores);
} }
string_list_free(str_list); string_list_free(str_list);
string_list_free(stnames);
string_list_free(stcores);
} }
static bool menu_displaylist_push_list_process(menu_displaylist_info_t *info) static bool menu_displaylist_push_list_process(menu_displaylist_info_t *info)