From 16dde76a68fd0c6b9070a90d6b4d152dd10cff48 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 20 Jul 2019 12:34:49 +0200 Subject: [PATCH] Cleanups --- retroarch.c | 10 ++-------- retroarch.h | 3 --- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/retroarch.c b/retroarch.c index 4c4d09da63..533fa105ef 100644 --- a/retroarch.c +++ b/retroarch.c @@ -3409,7 +3409,7 @@ bool rarch_environment_cb(unsigned cmd, void *data) rarch_ctl(RARCH_CTL_CONTENT_RUNTIME_LOG_DEINIT, NULL); rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL); - rarch_ctl(RARCH_CTL_SET_CORE_SHUTDOWN, NULL); + runloop_core_shutdown_initiated = true; break; case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL: @@ -19182,15 +19182,9 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data) task_queue_init(threaded_enable, runloop_task_msg_queue_push); } break; - case RARCH_CTL_SET_CORE_SHUTDOWN: - runloop_core_shutdown_initiated = true; - break; case RARCH_CTL_SET_SHUTDOWN: runloop_shutdown_initiated = true; break; - case RARCH_CTL_UNSET_SHUTDOWN: - runloop_shutdown_initiated = false; - break; case RARCH_CTL_IS_SHUTDOWN: return runloop_shutdown_initiated; case RARCH_CTL_DATA_DEINIT: @@ -20146,7 +20140,7 @@ static enum runloop_state runloop_check_state( { /* Loads dummy core instead of exiting RetroArch completely. * Aborts core shutdown if invoked. */ - rarch_ctl(RARCH_CTL_UNSET_SHUTDOWN, NULL); + runloop_shutdown_initiated = false; runloop_core_shutdown_initiated = false; } else diff --git a/retroarch.h b/retroarch.h index 1eee04221c..e0f597835e 100644 --- a/retroarch.h +++ b/retroarch.h @@ -144,10 +144,7 @@ enum rarch_ctl_state RARCH_CTL_IS_PAUSED, RARCH_CTL_SET_PAUSED, - RARCH_CTL_SET_CORE_SHUTDOWN, - RARCH_CTL_SET_SHUTDOWN, - RARCH_CTL_UNSET_SHUTDOWN, RARCH_CTL_IS_SHUTDOWN, /* Runloop state */