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

Move rarch_main_data_free to RARCH_CMD_PREPARE_DUMMY

Browse Source
This commit is contained in:
twinaphex 2015-03-23 06:54:39 +01:00
parent 42b054771a
commit b21c3c460a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroarch.c
View File

@ -2380,15 +2380,14 @@ bool rarch_main_command(unsigned cmd)
break; break;
case RARCH_CMD_PREPARE_DUMMY: case RARCH_CMD_PREPARE_DUMMY:
{ {
menu_handle_t *menu = menu_driver_get_ptr();
*global->fullpath = '\0';
(void)menu;
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_handle_t *menu = menu_driver_get_ptr();
if (menu) if (menu)
menu->load_no_content = false; menu->load_no_content = false;
#endif #endif
rarch_main_data_free();
*global->fullpath = '\0';
rarch_main_set_state(RARCH_ACTION_STATE_LOAD_CONTENT); rarch_main_set_state(RARCH_ACTION_STATE_LOAD_CONTENT);
global->system.shutdown = false; global->system.shutdown = false;

1
runloop.c
View File

@ -919,7 +919,6 @@ static int rarch_main_iterate_quit(void)
if (global->core_shutdown_initiated if (global->core_shutdown_initiated
&& settings->load_dummy_on_core_shutdown) && settings->load_dummy_on_core_shutdown)
{ {
rarch_main_data_free();
if (!rarch_main_command(RARCH_CMD_PREPARE_DUMMY)) if (!rarch_main_command(RARCH_CMD_PREPARE_DUMMY))
return -1; return -1;