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

Inline CMD_EVENT_LOAD_CORE_DEINIT

This commit is contained in:
twinaphex 2016-09-06 05:05:50 +02:00
parent a09601cbfa
commit 8467404fd6
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
command.c
View File

@ -1790,7 +1790,9 @@ void handle_quit_event()
command_event(CMD_EVENT_RESTORE_DEFAULT_SHADER_PRESET, NULL); command_event(CMD_EVENT_RESTORE_DEFAULT_SHADER_PRESET, NULL);
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL); #ifdef HAVE_MENU
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
#endif
#endif #endif
runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL); runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
@ -1846,20 +1848,15 @@ bool command_event(enum event_command cmd, void *data)
runloop_msg_queue_push(msg, 1, 100, true); runloop_msg_queue_push(msg, 1, 100, true);
} }
} }
#endif
break;
case CMD_EVENT_LOAD_CORE_DEINIT:
#ifdef HAVE_MENU
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
#endif #endif
break; break;
case CMD_EVENT_LOAD_CORE_PERSIST: case CMD_EVENT_LOAD_CORE_PERSIST:
command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL);
{ {
#ifdef HAVE_MENU #ifdef HAVE_MENU
bool *ptr = NULL; bool *ptr = NULL;
struct retro_system_info *system = NULL; struct retro_system_info *system = NULL;
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, &system); menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET, &system);
if (menu_driver_ctl(RARCH_MENU_CTL_LOAD_NO_CONTENT_GET, &ptr)) if (menu_driver_ctl(RARCH_MENU_CTL_LOAD_NO_CONTENT_GET, &ptr))
@ -1991,7 +1988,9 @@ bool command_event(enum event_command cmd, void *data)
NULL, NULL)) NULL, NULL))
return false; return false;
#ifdef HAVE_DYNAMIC #ifdef HAVE_DYNAMIC
command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL); #ifdef HAVE_MENU
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
#endif
#else #else
core_unload_game(); core_unload_game();
core_unload(); core_unload();

1
command.h
View File

@ -43,7 +43,6 @@ enum event_command
CMD_EVENT_SET_PER_GAME_RESOLUTION, CMD_EVENT_SET_PER_GAME_RESOLUTION,
CMD_EVENT_SET_FRAME_LIMIT, CMD_EVENT_SET_FRAME_LIMIT,
/* Loads core. */ /* Loads core. */
CMD_EVENT_LOAD_CORE_DEINIT,
CMD_EVENT_LOAD_CORE, CMD_EVENT_LOAD_CORE,
CMD_EVENT_LOAD_CORE_PERSIST, CMD_EVENT_LOAD_CORE_PERSIST,
CMD_EVENT_UNLOAD_CORE, CMD_EVENT_UNLOAD_CORE,