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

Merge pull request #2950 from libretro/revert-2948-master

Browse Source 
Revert "(XMB) Bugfix the thumbnail display. And prevent download on non playl…"
This commit is contained in:
Twinaphex 2016-05-05 17:00:32 +02:00
commit 36f63e87d2
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/drivers/xmb.c
View File

@ -770,8 +770,6 @@ static void xmb_update_thumbnail_image(void *data)
xmb_handle_t *xmb = (xmb_handle_t*)data; xmb_handle_t *xmb = (xmb_handle_t*)data;
download_t *ud; download_t *ud;
char buf[PATH_MAX_LENGTH]; char buf[PATH_MAX_LENGTH];
unsigned selection = 0;
menu_entry_t entry;
if (!xmb) if (!xmb)
return; return;
@ -783,13 +781,6 @@ static void xmb_update_thumbnail_image(void *data)
menu_display_handle_thumbnail_upload, NULL); menu_display_handle_thumbnail_upload, NULL);
else else
{ {
menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection);
menu_entry_get(&entry, 0, selection, NULL, true);
if (entry.type != MENU_FILE_RPL_ENTRY)
return;
ud = (download_t *)malloc(sizeof(*ud) + strlen(xmb->thumbnail_file_path)); ud = (download_t *)malloc(sizeof(*ud) + strlen(xmb->thumbnail_file_path));
if (!ud) if (!ud)
@ -2839,16 +2830,12 @@ static void xmb_navigation_set(void *data, bool scroll)
xmb_handle_t *xmb = (xmb_handle_t*)data; xmb_handle_t *xmb = (xmb_handle_t*)data;
xmb_selection_pointer_changed(xmb, true); xmb_selection_pointer_changed(xmb, true);
size_t depth, selection; size_t selection;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection)) if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return; return;
depth = xmb_list_get_size(xmb, MENU_LIST_PLAIN); xmb_update_thumbnail_path(xmb, selection);
if (strcmp(xmb_thumbnails_ident(), "OFF") && depth == 1) xmb_update_thumbnail_image(xmb);
{
xmb_update_thumbnail_path(xmb, selection);
xmb_update_thumbnail_image(xmb);
}
} }
static void xmb_navigation_alphabet(void *data, size_t *unused) static void xmb_navigation_alphabet(void *data, size_t *unused)