mirror of
https://github.com/libretro/RetroArch.git
synced 2025-04-02 10:51:52 -04:00
Inline CMD_EVENT_LOAD_CORE_DEINIT
This commit is contained in:
parent
a09601cbfa
commit
8467404fd6
2 changed files with 7 additions and 9 deletions
15
command.c
15
command.c
|
@ -1790,7 +1790,9 @@ void handle_quit_event()
|
|||
command_event(CMD_EVENT_RESTORE_DEFAULT_SHADER_PRESET, NULL);
|
||||
|
||||
#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
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case CMD_EVENT_LOAD_CORE_DEINIT:
|
||||
#ifdef HAVE_MENU
|
||||
menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
|
||||
#endif
|
||||
break;
|
||||
case CMD_EVENT_LOAD_CORE_PERSIST:
|
||||
command_event(CMD_EVENT_LOAD_CORE_DEINIT, NULL);
|
||||
{
|
||||
#ifdef HAVE_MENU
|
||||
bool *ptr = 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);
|
||||
|
||||
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))
|
||||
return false;
|
||||
#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
|
||||
core_unload_game();
|
||||
core_unload();
|
||||
|
|
|
@ -43,7 +43,6 @@ enum event_command
|
|||
CMD_EVENT_SET_PER_GAME_RESOLUTION,
|
||||
CMD_EVENT_SET_FRAME_LIMIT,
|
||||
/* Loads core. */
|
||||
CMD_EVENT_LOAD_CORE_DEINIT,
|
||||
CMD_EVENT_LOAD_CORE,
|
||||
CMD_EVENT_LOAD_CORE_PERSIST,
|
||||
CMD_EVENT_UNLOAD_CORE,
|
||||
|
|
Loading…
Add table
Reference in a new issue