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

Revert "Make this code somewhat more like the other menu drivers"

Browse Source 
This reverts commit 6c5d5ea497.
This commit is contained in:
twinaphex 2017-05-28 15:14:35 +02:00
parent 6c5d5ea497
commit b5aef51cc0
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
driver.c
View File

@ -396,7 +396,7 @@ void driver_uninit(int flags)
core_info_free_current_core();
#ifdef HAVE_MENU
if (flags & DRIVER_MENU_MASK && !menu_driver_ctl(RARCH_MENU_CTL_OWNS_DRIVER, NULL))
if (flags & DRIVER_MENU_MASK)
menu_driver_ctl(RARCH_MENU_CTL_DEINIT, NULL);
#endif
@ -415,9 +415,6 @@ void driver_uninit(int flags)
if (flags & DRIVER_AUDIO_MASK)
audio_driver_deinit();
if ((flags & DRIVER_MENU_MASK) && !menu_driver_ctl(RARCH_MENU_CTL_OWNS_DRIVER, NULL))
menu_driver_destroy_data();
if ((flags & DRIVER_VIDEO_MASK) && !video_driver_owns_driver())
video_driver_destroy_data();

9
menu/menu_driver.c
View File

@ -1688,11 +1688,6 @@ void menu_driver_set_thumbnail_content(char *s, size_t len)
menu_driver_ctx->set_thumbnail_content(menu_userdata, s, len);
}
void menu_driver_destroy_data(void)
{
menu_driver_ctx = NULL;
}
void menu_driver_destroy(void)
{
menu_driver_pending_quick_menu = false;
@ -1702,6 +1697,7 @@ void menu_driver_destroy(void)
menu_driver_load_no_content = false;
menu_driver_alive = false;
menu_driver_data_own = false;
menu_driver_ctx = NULL;
menu_userdata = NULL;
}
@ -1851,10 +1847,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_input_ctl(MENU_INPUT_CTL_DEINIT, NULL);
if (menu_driver_ctx && menu_driver_ctx->free)
{
menu_driver_ctx->free(menu_userdata);
menu_driver_ctx = NULL;
}
if (menu_userdata)
free(menu_userdata);

2
menu/menu_driver.h
View File

@ -685,8 +685,6 @@ void menu_display_reset_textures_list(const char *texture_path, const char *icon
void menu_driver_destroy(void);
void menu_driver_destroy_data(void);
extern uintptr_t menu_display_white_texture;
extern menu_display_ctx_driver_t menu_display_ctx_gl;