Refactor rarch_main_deinit_core

This commit is contained in:
twinaphex 2014-08-02 14:26:11 +02:00
parent c564278809
commit 5bf4be925b
2 changed files with 9 additions and 9 deletions

View File

@ -784,7 +784,6 @@ int rarch_main_init(int argc, char *argv[]);
void rarch_main_command(unsigned action); void rarch_main_command(unsigned action);
bool rarch_main_iterate(void); bool rarch_main_iterate(void);
void rarch_main_deinit(void); void rarch_main_deinit(void);
void rarch_main_deinit_core(void);
void rarch_render_cached_frame(void); void rarch_render_cached_frame(void);
void rarch_deinit_msg_queue(void); void rarch_deinit_msg_queue(void);
void rarch_input_poll(void); void rarch_input_poll(void);

View File

@ -2964,6 +2964,13 @@ static void init_sram(void)
RARCH_LOG("SRAM will not be saved.\n"); RARCH_LOG("SRAM will not be saved.\n");
} }
static void main_deinit_core(void)
{
pretro_unload_game();
pretro_deinit();
uninit_libretro_sym();
}
int rarch_main_init(int argc, char *argv[]) int rarch_main_init(int argc, char *argv[])
{ {
int sjlj_ret; int sjlj_ret;
@ -3055,7 +3062,7 @@ int rarch_main_init(int argc, char *argv[])
error: error:
uninit_drivers(); uninit_drivers();
rarch_main_deinit_core(); main_deinit_core();
g_extern.main_is_init = false; g_extern.main_is_init = false;
return 1; return 1;
@ -3339,12 +3346,6 @@ bool rarch_main_iterate(void)
return true; return true;
} }
void rarch_main_deinit_core(void)
{
pretro_unload_game();
pretro_deinit();
uninit_libretro_sym();
}
static void deinit_temporary_content(void) static void deinit_temporary_content(void)
{ {
@ -3404,7 +3405,7 @@ void rarch_main_deinit(void)
uninit_drivers(); uninit_drivers();
rarch_main_deinit_core(); main_deinit_core();
deinit_temporary_content(); deinit_temporary_content();
deinit_subsystem_fullpaths(); deinit_subsystem_fullpaths();