From 84948c9b8b02ac4878bc495348aeab3225e7d0ad Mon Sep 17 00:00:00 2001 From: twinaphex Date: Fri, 12 Oct 2018 23:12:06 +0200 Subject: [PATCH] Backport orbea commits - don't unload content if it was never loaded - don't deinit core when they are not inited - sorry for the long delays --- core_impl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/core_impl.c b/core_impl.c index eb4b2fffd0..a8a5acb949 100644 --- a/core_impl.c +++ b/core_impl.c @@ -396,7 +396,9 @@ bool core_unload(void) { video_driver_set_cached_frame_ptr(NULL); - current_core.retro_deinit(); + if (current_core.inited) + current_core.retro_deinit(); + return true; } @@ -407,9 +409,11 @@ bool core_unload_game(void) video_driver_set_cached_frame_ptr(NULL); - current_core.retro_unload_game(); - - current_core.game_loaded = false; + if (current_core.game_loaded) + { + current_core.retro_unload_game(); + current_core.game_loaded = false; + } audio_driver_stop();