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

Merge pull request #2435 from lakkatv/master

Browse Source 
Prevent loosing core assignations for playlists that doesn't exist ye…
This commit is contained in:
Twinaphex 2015-11-19 21:25:01 +01:00
commit 8a5e80737e
3 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretro-common/include/string/string_list.h
View File

@ -60,7 +60,7 @@ struct string_list
* *
* Returns: true (1) if element could be found, otherwise false (0). * Returns: true (1) if element could be found, otherwise false (0).
*/ */
bool string_list_find_elem(const struct string_list *list, const char *elem); int string_list_find_elem(const struct string_list *list, const char *elem);
/** /**
* string_list_find_elem_prefix: * string_list_find_elem_prefix:

4
libretro-common/string/string_list.c
View File

@ -225,7 +225,7 @@ error:
* *
* Returns: true (1) if element could be found, otherwise false (0). * Returns: true (1) if element could be found, otherwise false (0).
*/ */
bool string_list_find_elem(const struct string_list *list, const char *elem) int string_list_find_elem(const struct string_list *list, const char *elem)
{ {
size_t i; size_t i;
@ -235,7 +235,7 @@ bool string_list_find_elem(const struct string_list *list, const char *elem)
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
if (strcasecmp(list->elems[i].data, elem) == 0) if (strcasecmp(list->elems[i].data, elem) == 0)
return true; return i+1;
} }
return false; return false;

32
menu/menu_displaylist.c
View File

@ -2331,19 +2331,19 @@ static void menu_displaylist_parse_playlist_associations(menu_displaylist_info_t
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
struct string_list *str_list = dir_list_new_special(settings->playlist_directory, DIR_LIST_COLLECTIONS, NULL); struct string_list *str_list = dir_list_new_special(settings->playlist_directory, DIR_LIST_COLLECTIONS, NULL);
struct string_list *stnames = string_split(settings->playlist_names, ";");
struct string_list *stcores = string_split(settings->playlist_cores, ";");
if (str_list && str_list->size) if (str_list && str_list->size)
{ {
unsigned i; unsigned i;
char new_playlist_names[PATH_MAX_LENGTH] = {0}; char new_playlist_names[PATH_MAX_LENGTH] = {0};
char new_playlist_cores[PATH_MAX_LENGTH] = {0}; char new_playlist_cores[PATH_MAX_LENGTH] = {0};
struct string_list *str_list2 = NULL;
if (settings->playlist_names[0] == '\0' && settings->playlist_cores[0] == '\0')
str_list2 = string_split(info->label, ";");
for (i = 0; i < str_list->size; i++) for (i = 0; i < str_list->size; i++)
{ {
unsigned found = 0;
union string_list_elem_attr attr = {0};
char path_base[PATH_MAX_LENGTH] = {0}; char path_base[PATH_MAX_LENGTH] = {0};
char core_path[PATH_MAX_LENGTH] = {0}; char core_path[PATH_MAX_LENGTH] = {0};
const char *path = path_basename(str_list->elems[i].data); const char *path = path_basename(str_list->elems[i].data);
@ -2353,23 +2353,33 @@ static void menu_displaylist_parse_playlist_associations(menu_displaylist_info_t
strlcpy(path_base, path, sizeof(path_base)); strlcpy(path_base, path, sizeof(path_base));
strlcat(new_playlist_names, path_base, sizeof(new_playlist_names)); found = string_list_find_elem(stnames, path_base);
strlcat(new_playlist_names, ";", sizeof(new_playlist_names)); if (found)
{
strlcat(new_playlist_cores, core_path, sizeof(new_playlist_cores)); string_list_set(stcores, found-1, core_path);
strlcat(new_playlist_cores, ";", sizeof(new_playlist_cores)); }
else
{
string_list_append(stnames, path_base, attr);
string_list_append(stcores, core_path, attr);
}
path_remove_extension(path_base); path_remove_extension(path_base);
menu_entries_push(info->list, menu_entries_push(info->list,
path_base, path_base,
str_list->elems[i].data, MENU_SETTINGS_PLAYLIST_ASSOCIATION_START + i, 0, 0); str_list->elems[i].data, MENU_SETTINGS_PLAYLIST_ASSOCIATION_START + i, 0, 0);
} }
string_list_join_concat(new_playlist_names, sizeof(new_playlist_names), stnames, ";");
string_list_join_concat(new_playlist_cores, sizeof(new_playlist_cores), stcores, ";");
strlcpy(settings->playlist_names, new_playlist_names, sizeof(settings->playlist_names)); strlcpy(settings->playlist_names, new_playlist_names, sizeof(settings->playlist_names));
strlcpy(settings->playlist_cores, new_playlist_cores, sizeof(settings->playlist_cores)); strlcpy(settings->playlist_cores, new_playlist_cores, sizeof(settings->playlist_cores));
string_list_free(str_list2);
} }
string_list_free(str_list);
string_list_free(stnames);
string_list_free(stcores);
} }
int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type) int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)