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

(RGUI) Cleanups

This commit is contained in:
twinaphex 2015-02-02 18:56:58 +01:00
parent 135fc60ec2
commit 26dead5902
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
menu/drivers/rgui.c
View File

@ -523,25 +523,18 @@ static void *rgui_init(void)
menu->userdata = (rgui_handle_t*)calloc(1, sizeof(rgui_handle_t)); menu->userdata = (rgui_handle_t*)calloc(1, sizeof(rgui_handle_t));
if (!menu->userdata) if (!menu->userdata)
{ goto error;
free(menu);
return NULL;
}
rgui = (rgui_handle_t*)menu->userdata; rgui = (rgui_handle_t*)menu->userdata;
rgui->frame_buf = (uint16_t*)malloc(400 * 240 * sizeof(uint16_t)); rgui->frame_buf = (uint16_t*)malloc(400 * 240 * sizeof(uint16_t));
if (!rgui->frame_buf) if (!rgui->frame_buf)
{ goto error;
free(menu->userdata);
free(menu);
return NULL;
}
menu->width = 320; menu->width = 320;
menu->height = 240; menu->height = 240;
menu->begin = 0; menu->begin = 0;
rgui->frame_buf_pitch = menu->width * sizeof(uint16_t); rgui->frame_buf_pitch = menu->width * sizeof(uint16_t);
ret = rguidisp_init_font(menu); ret = rguidisp_init_font(menu);
@ -551,13 +544,19 @@ static void *rgui_init(void)
RARCH_ERR("No font bitmap or binary, abort"); RARCH_ERR("No font bitmap or binary, abort");
rarch_main_command(RARCH_CMD_QUIT_RETROARCH); rarch_main_command(RARCH_CMD_QUIT_RETROARCH);
goto error;
free(menu->userdata);
free(menu);
return NULL;
} }
return menu; return menu;
error:
if (rgui && rgui->frame_buf)
free(rgui->frame_buf);
if (menu && menu->userdata)
free(menu->userdata);
if (menu)
free(menu);
return NULL;
} }
static void rgui_free(void *data) static void rgui_free(void *data)