From 528b2b9b00eb2fe231997fd316918794d8417480 Mon Sep 17 00:00:00 2001 From: FIX94 Date: Fri, 24 Jun 2016 20:10:11 +0200 Subject: [PATCH] only remove core info on close content if the current platform is either dynamic or can fork to other cores, would get stuck on no core otherwise --- menu/menu_driver.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/menu/menu_driver.c b/menu/menu_driver.c index 44f09e7255..467980fac8 100644 --- a/menu/menu_driver.c +++ b/menu/menu_driver.c @@ -425,8 +425,13 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data) } break; case RARCH_MENU_CTL_SYSTEM_INFO_DEINIT: - libretro_free_system_info(&menu_driver_system); - memset(&menu_driver_system, 0, sizeof(struct retro_system_info)); +#ifndef HAVE_DYNAMIC + if (frontend_driver_has_fork()) +#endif + { + libretro_free_system_info(&menu_driver_system); + memset(&menu_driver_system, 0, sizeof(struct retro_system_info)); + } break; case RARCH_MENU_CTL_RENDER_MESSAGEBOX: if (menu_driver_ctx->render_messagebox)