ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(XMB) cleanup xmb_list_insert

This commit is contained in:
Twinaphex 2015-06-11 20:14:59 +02:00
parent f6e63f7755
commit 698e66be57
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
menu/drivers/xmb.c
View File

@ -1873,9 +1873,9 @@ static void xmb_navigation_alphabet(size_t *unused)
static void xmb_list_insert(file_list_t *list, static void xmb_list_insert(file_list_t *list,
const char *path, const char *unused, size_t list_size) const char *path, const char *unused, size_t list_size)
{ {
int current = 0, i = list_size; int current = 0, i = list_size;
xmb_node_t *node = NULL; xmb_node_t *node = NULL;
xmb_handle_t *xmb = NULL; xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
if (!menu) if (!menu)
@ -1886,19 +1886,14 @@ static void xmb_list_insert(file_list_t *list,
if (!list || !xmb) if (!list || !xmb)
return; return;
list->list[i].userdata = (xmb_node_t*)calloc(1, sizeof(xmb_node_t)); node = (xmb_node_t*)calloc(1, sizeof(xmb_node_t));
if (!list->list[i].userdata) if (!node)
{ {
RARCH_ERR("XMB node could not be allocated.\n"); RARCH_ERR("XMB node could not be allocated.\n");
return; return;
} }
node = (xmb_node_t*)list->list[i].userdata;
if (!node)
return;
current = menu->navigation.selection_ptr; current = menu->navigation.selection_ptr;
node->alpha = xmb->item.passive.alpha; node->alpha = xmb->item.passive.alpha;
@ -1913,6 +1908,10 @@ static void xmb_list_insert(file_list_t *list,
node->label_alpha = xmb->item.active.alpha; node->label_alpha = xmb->item.active.alpha;
node->zoom = xmb->item.active.zoom; node->zoom = xmb->item.active.zoom;
} }
if (list->list[i].userdata)
free(list->list[i].userdata);
list->list[i].userdata = (xmb_node_t*)node;
} }
static void xmb_list_delete(file_list_t *list, static void xmb_list_delete(file_list_t *list,