This commit is contained in:
twinaphex 2016-01-30 05:21:05 +01:00
parent 8670c2e405
commit f5b7add383
2 changed files with 5 additions and 6 deletions

View File

@ -64,14 +64,11 @@ void main_exit(void *args)
event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL); event_cmd_ctl(EVENT_CMD_MENU_SAVE_CURRENT_CONFIG, NULL);
if (content_ctl(CONTENT_CTL_IS_INITED, NULL))
{
#ifdef HAVE_MENU #ifdef HAVE_MENU
/* Do not want menu context to live any more. */ /* Do not want menu context to live any more. */
menu_driver_ctl(RARCH_MENU_CTL_UNSET_OWN_DRIVER, NULL); menu_driver_ctl(RARCH_MENU_CTL_UNSET_OWN_DRIVER, NULL);
#endif #endif
rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL); rarch_ctl(RARCH_CTL_MAIN_DEINIT, NULL);
}
event_cmd_ctl(EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG, NULL); event_cmd_ctl(EVENT_CMD_PERFCNT_REPORT_FRONTEND_LOG, NULL);

View File

@ -613,6 +613,8 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
menu_driver_data_own = true; menu_driver_data_own = true;
break; break;
case RARCH_MENU_CTL_UNSET_OWN_DRIVER: case RARCH_MENU_CTL_UNSET_OWN_DRIVER:
if (!content_ctl(CONTENT_CTL_IS_INITED, NULL))
return false;
menu_driver_data_own = false; menu_driver_data_own = false;
break; break;
case RARCH_MENU_CTL_SET_TEXTURE: case RARCH_MENU_CTL_SET_TEXTURE: