libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-20 09:34:09 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-02-10 03:59:17 +01:00
parent bb1fa17718
commit 3763c6d4c0
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/menu_driver.c
View File

@ -186,15 +186,6 @@ static bool menu_init(void)
{
settings_t *settings = config_get_ptr();
menu_driver_data = (menu_handle_t*)
menu_driver_ctx->init(&menu_userdata);
if (!menu_driver_data)
return false;
strlcpy(settings->menu.driver, menu_driver_ctx->ident,
sizeof(settings->menu.driver));
if (!menu_entries_ctl(MENU_ENTRIES_CTL_INIT, NULL))
return false;
@ -440,6 +431,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
static bool menu_driver_data_own = false;
static content_playlist_t *menu_driver_playlist = NULL;
static struct video_shader *menu_driver_shader = NULL;
settings_t *settings = config_get_ptr();
switch (state)
{
@ -606,13 +598,19 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
if (!menu_display_ctl(RARCH_MENU_CTL_FIND_DRIVER, NULL))
return false;
if (!menu_init())
menu_driver_data = (menu_handle_t*)
menu_driver_ctx->init(&menu_userdata);
if (!menu_driver_data || !menu_init())
{
menu_driver_ctl(RARCH_MENU_CTL_DEINIT, NULL);
retro_fail(1, "init_menu()");
return false;
}
strlcpy(settings->menu.driver, menu_driver_ctx->ident,
sizeof(settings->menu.driver));
if (menu_driver_ctx->lists_init)
{
if (!menu_driver_ctx->lists_init(menu_driver_data))