From 5bf4be925b1914a34a05f2f52542eba7e7197574 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 2 Aug 2014 14:26:11 +0200 Subject: [PATCH] Refactor rarch_main_deinit_core --- general.h | 1 - retroarch.c | 17 +++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/general.h b/general.h index a7f50bb3fc..80ecb06d93 100644 --- a/general.h +++ b/general.h @@ -784,7 +784,6 @@ int rarch_main_init(int argc, char *argv[]); void rarch_main_command(unsigned action); bool rarch_main_iterate(void); void rarch_main_deinit(void); -void rarch_main_deinit_core(void); void rarch_render_cached_frame(void); void rarch_deinit_msg_queue(void); void rarch_input_poll(void); diff --git a/retroarch.c b/retroarch.c index 9ec46f35ad..1f8f5b9cac 100644 --- a/retroarch.c +++ b/retroarch.c @@ -2964,6 +2964,13 @@ static void init_sram(void) 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 sjlj_ret; @@ -3055,7 +3062,7 @@ int rarch_main_init(int argc, char *argv[]) error: uninit_drivers(); - rarch_main_deinit_core(); + main_deinit_core(); g_extern.main_is_init = false; return 1; @@ -3339,12 +3346,6 @@ bool rarch_main_iterate(void) return true; } -void rarch_main_deinit_core(void) -{ - pretro_unload_game(); - pretro_deinit(); - uninit_libretro_sym(); -} static void deinit_temporary_content(void) { @@ -3404,7 +3405,7 @@ void rarch_main_deinit(void) uninit_drivers(); - rarch_main_deinit_core(); + main_deinit_core(); deinit_temporary_content(); deinit_subsystem_fullpaths();