mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-17 20:43:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-02-10 21:01:55 +01:00
parent 8620b4c33b
commit 46750ff3e6
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
menu/menu_driver.c
View File

@ -147,7 +147,7 @@ static void bundle_decompressed(void *task_data,
* *
* Returns: menu handle on success, otherwise NULL. * Returns: menu handle on success, otherwise NULL.
**/ **/
static bool menu_init(void) static bool menu_init(menu_handle_t *menu_data)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -162,8 +162,8 @@ static bool menu_init(void)
if (settings->menu_show_start_screen) if (settings->menu_show_start_screen)
{ {
menu_driver_data->push_help_screen = true; menu_data->push_help_screen = true;
menu_driver_data->help_screen_type = MENU_HELP_WELCOME; menu_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);
} }
@ -172,15 +172,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_driver_data->push_help_screen && menu_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_driver_data->help_screen_type = MENU_HELP_EXTRACT; menu_data->help_screen_type = MENU_HELP_EXTRACT;
menu_driver_data->push_help_screen = true; menu_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,
@ -362,6 +362,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_driver_alive = false; menu_driver_alive = false;
menu_driver_data_own = false; menu_driver_data_own = false;
menu_driver_ctx = NULL; menu_driver_ctx = NULL;
menu_userdata = NULL;
break; break;
case RARCH_MENU_CTL_PLAYLIST_FREE: case RARCH_MENU_CTL_PLAYLIST_FREE:
if (menu_driver_playlist) if (menu_driver_playlist)
@ -591,7 +592,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_driver_data = (menu_handle_t*) menu_driver_data = (menu_handle_t*)
menu_driver_ctx->init(&menu_userdata); menu_driver_ctx->init(&menu_userdata);
if (!menu_driver_data || !menu_init()) if (!menu_driver_data || !menu_init(menu_driver_data))
{ {
retro_fail(1, "init_menu()"); retro_fail(1, "init_menu()");
return false; return false;