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

Cleanups

This commit is contained in:
twinaphex 2016-01-11 13:24:05 +01:00
parent a6ef1a5a42
commit 0d14c588d2
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/menu_driver.c
View File

@ -601,26 +601,24 @@ void *menu_init(const void *data)
goto error; goto error;
#endif #endif
menu->push_help_screen = settings->menu_show_start_screen; if (settings->menu_show_start_screen)
{
menu->push_help_screen = true;
menu->help_screen_type = MENU_HELP_WELCOME; menu->help_screen_type = MENU_HELP_WELCOME;
settings->menu_show_start_screen = false; settings->menu_show_start_screen = false;
}
if ( if ( settings->bundle_assets_extract_enable
settings->bundle_assets_extract_enable
&& !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
&& menu->push_help_screen && menu->push_help_screen
#else #ifndef IOS
&& settings->bundle_assets_extract_version_current != settings->bundle_assets_extract_last_version && (settings->bundle_assets_extract_version_current != settings->bundle_assets_extract_last_version)
#endif #endif
) )
{ {
menu->help_screen_type = MENU_HELP_EXTRACT; menu->help_screen_type = MENU_HELP_EXTRACT;
menu->push_help_screen = true; menu->push_help_screen = true;
#ifdef IOS
settings->menu_show_start_screen = false;
#endif
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
rarch_task_push_decompress(settings->bundle_assets_src_path, settings->bundle_assets_dst_path, rarch_task_push_decompress(settings->bundle_assets_src_path, settings->bundle_assets_dst_path,
settings->bundle_assets_dst_path_subdir, NULL, bundle_decompressed, NULL); settings->bundle_assets_dst_path_subdir, NULL, bundle_decompressed, NULL);