libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-08 07:03:30 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Make menu_driver_free a static function

Browse Source
This commit is contained in:
twinaphex 2016-02-04 20:12:58 +01:00
parent 667e33e82b
commit c039e4c6ab
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
menu/menu_driver.c
View File

@ -142,6 +142,17 @@ menu_handle_t *menu_driver_get_ptr(void)
return menu_driver_data;
}
static void menu_driver_free(void)
{
if (menu_driver_ctx && menu_driver_ctx->free)
menu_driver_ctx->free(menu_userdata);
menu_driver_ctx = NULL;
if (menu_userdata)
free(menu_userdata);
menu_userdata = NULL;
}
/**
* menu_free:
* @menu : Menu handle.
@ -157,7 +168,9 @@ static void menu_free(menu_handle_t *menu)
menu_shader_free(menu);
menu_input_ctl(MENU_INPUT_CTL_DEINIT, NULL);
menu_navigation_ctl(MENU_NAVIGATION_CTL_DEINIT, NULL);
menu_driver_free(menu);
menu_driver_free();
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
menu_display_free();
menu_entries_ctl(MENU_ENTRIES_CTL_DEINIT, NULL);
@ -381,20 +394,6 @@ int menu_driver_bind_init(menu_file_list_cbs_t *cbs,
return ret;
}
void menu_driver_free(menu_handle_t *menu)
{
const menu_ctx_driver_t *driver = menu_driver_ctx;
if (driver->free)
driver->free(menu_userdata);
if (!menu_driver_data)
return;
if (menu_userdata)
free(menu_userdata);
menu_userdata = NULL;
}
int menu_driver_iterate(enum menu_action action)
{

2
menu/menu_driver.h
View File

@ -353,8 +353,6 @@ void init_menu(void);
menu_handle_t *menu_driver_get_ptr(void);
void menu_driver_free(menu_handle_t *menu);
bool menu_driver_load_image(void *data, menu_image_type_t type);
void menu_driver_list_cache(menu_list_type_t type, unsigned action);