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

pass userdata handle to list_get_entry callback

This commit is contained in:
twinaphex 2015-12-11 14:52:16 +01:00
parent 9e383749ae
commit 9580dc5392
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
menu/drivers/xmb.c
View File

@ -286,8 +286,7 @@ static void *xmb_list_get_entry(void *data, menu_list_type_t type, unsigned i)
{ {
void *ptr = NULL; void *ptr = NULL;
size_t list_size = 0; size_t list_size = 0;
menu_handle_t *menu = (menu_handle_t*)data; xmb_handle_t *xmb = (xmb_handle_t*)data;
xmb_handle_t *xmb = menu ? (xmb_handle_t*)menu->userdata : NULL;
file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0); file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
switch (type) switch (type)

4
menu/menu_driver.c
View File

@ -237,7 +237,9 @@ void *menu_driver_list_get_entry(menu_list_type_t type, unsigned i)
const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr(); const menu_ctx_driver_t *driver = menu_ctx_driver_get_ptr();
if (driver && driver->list_get_entry) if (driver && driver->list_get_entry)
return driver->list_get_entry(menu_driver_data, type, i); return driver->list_get_entry(
menu_driver_data ? menu_driver_data->userdata : NULL,
type, i);
return NULL; return NULL;
} }