mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu Disp) init_assets - calloc menu_texture

Browse Source
This commit is contained in:
twinaphex 2013-11-19 02:12:09 +01:00
parent 3f0be66ffc
commit 59ad1baea7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/menu/disp/rmenu.c
View File

@ -400,6 +400,11 @@ void rmenu_set_texture(void *data, bool enable)
static void rmenu_init_assets(void *data)
{
rgui_handle_t *rgui = (rgui_handle_t*)data;
if (!rgui)
return;
menu_texture = (struct texture_image*)calloc(1, sizeof(*menu_texture));
texture_image_load(g_extern.menu_texture_path, menu_texture);
rgui->width = menu_texture->width;
rgui->height = menu_texture->height;
@ -411,8 +416,6 @@ static void *rmenu_init(void)
{
rgui_handle_t *rgui = (rgui_handle_t*)calloc(1, sizeof(*rgui));
menu_texture = (struct texture_image*)calloc(1, sizeof(*menu_texture));
rmenu_init_assets(rgui);
return rgui;
@ -432,13 +435,14 @@ static void rmenu_free_assets(void *data)
menu_texture->pixels = NULL;
}
#else
if (menu_texture)
if (menu_texture->pixels)
{
free(menu_texture->pixels);
menu_texture->pixels = NULL;
}
menu_texture_inited = false;
#endif
menu_texture_inited = false;
}
static void rmenu_free(void *data)