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

(xmb.c) Try to make sure 1st and 2nd arguments for fill_pathname_join

Browse Source 
are not one and the same
This commit is contained in:
twinaphex 2016-09-15 16:25:10 +02:00
parent 6c4c0cf5e7
commit 78c4bc4a5b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/drivers/xmb.c
View File

@ -753,6 +753,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
settings->directory.thumbnails, settings->directory.thumbnails,
xmb->title_name, xmb->title_name,
sizeof(xmb->thumbnail_file_path)); sizeof(xmb->thumbnail_file_path));
fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path, fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path,
xmb_thumbnails_ident(), sizeof(xmb->thumbnail_file_path)); xmb_thumbnails_ident(), sizeof(xmb->thumbnail_file_path));
@ -760,8 +761,9 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
if (tmp) if (tmp)
{ {
fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path, char tmp_new[PATH_MAX_LENGTH];
tmp, sizeof(xmb->thumbnail_file_path)); fill_pathname_join(tmp_new, xmb->thumbnail_file_path, tmp, sizeof(tmp_new));
strlcpy(xmb->thumbnail_file_path, tmp_new, sizeof(xmb->thumbnail_file_path));
free(tmp); free(tmp);
} }

4
menu/drivers/zarch.c
View File

@ -513,14 +513,16 @@ static int zarch_zui_render_lay_root_recent(zui_t *zui, struct zui_tabbed *tabbe
for (i = zui->recent_dlist_first; i < size; ++i) for (i = zui->recent_dlist_first; i < size; ++i)
{ {
char rich_label[PATH_MAX_LENGTH] = {0}; char rich_label[PATH_MAX_LENGTH] = {0};
char entry_value[PATH_MAX_LENGTH] = {0};
menu_entry_t entry = {{0}}; menu_entry_t entry = {{0}};
menu_entry_get(&entry, 0, i, NULL, true); menu_entry_get(&entry, 0, i, NULL, true);
menu_entry_get_rich_label(i, rich_label, sizeof(rich_label)); menu_entry_get_rich_label(i, rich_label, sizeof(rich_label));
menu_entry_get_value(i, entry_value,sizeof(entry_value));
if (zarch_zui_list_item(zui, tabbed, 0, if (zarch_zui_list_item(zui, tabbed, 0,
tabbed->tabline_size + j * ZUI_ITEM_SIZE_PX, tabbed->tabline_size + j * ZUI_ITEM_SIZE_PX,
rich_label, i, entry.value, gamepad_index == (signed)i)) rich_label, i, entry_value, gamepad_index == (signed)i))
{ {
if (menu_entry_action(&entry, i, MENU_ACTION_OK)) if (menu_entry_action(&entry, i, MENU_ACTION_OK))
return 1; return 1;