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

(menu_driver.c0 Cleanups

This commit is contained in:
twinaphex 2016-02-10 03:52:02 +01:00
parent e0a29599f4
commit efc580c071
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
menu/menu_driver.c
View File

@ -184,15 +184,12 @@ static void bundle_decompressed(void *task_data,
**/ **/
static bool menu_init(void) static bool menu_init(void)
{ {
menu_handle_t *menu = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!menu_driver_ctx) menu_driver_data = (menu_handle_t*)
return false; menu_driver_ctx->init(&menu_userdata);
menu = (menu_handle_t*)menu_driver_ctx->init(&menu_userdata); if (!menu_driver_data)
if (!menu)
return false; return false;
strlcpy(settings->menu.driver, menu_driver_ctx->ident, strlcpy(settings->menu.driver, menu_driver_ctx->ident,
@ -209,8 +206,8 @@ static bool menu_init(void)
if (settings->menu_show_start_screen) if (settings->menu_show_start_screen)
{ {
menu->push_help_screen = true; menu_driver_data->push_help_screen = true;
menu->help_screen_type = MENU_HELP_WELCOME; menu_driver_data->help_screen_type = MENU_HELP_WELCOME;
settings->menu_show_start_screen = false; settings->menu_show_start_screen = false;
event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL); event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL);
} }
@ -219,15 +216,15 @@ static bool menu_init(void)
&& !string_is_empty(settings->bundle_assets_src_path) && !string_is_empty(settings->bundle_assets_src_path)
&& !string_is_empty(settings->bundle_assets_dst_path) && !string_is_empty(settings->bundle_assets_dst_path)
#ifdef IOS #ifdef IOS
&& menu->push_help_screen && menu_driver_data->push_help_screen
#else #else
&& (settings->bundle_assets_extract_version_current && (settings->bundle_assets_extract_version_current
!= settings->bundle_assets_extract_last_version) != settings->bundle_assets_extract_last_version)
#endif #endif
) )
{ {
menu->help_screen_type = MENU_HELP_EXTRACT; menu_driver_data->help_screen_type = MENU_HELP_EXTRACT;
menu->push_help_screen = true; menu_driver_data->push_help_screen = true;
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
rarch_task_push_decompress(settings->bundle_assets_src_path, rarch_task_push_decompress(settings->bundle_assets_src_path,
settings->bundle_assets_dst_path, settings->bundle_assets_dst_path,
@ -241,8 +238,6 @@ static bool menu_init(void)
if (!menu_display_ctl(MENU_DISPLAY_CTL_INIT, NULL)) if (!menu_display_ctl(MENU_DISPLAY_CTL_INIT, NULL))
return false; return false;
menu_driver_data = (void*)menu;
return true; return true;
} }