From 7e4605836288e4493babb8da33fd256c6227b9f2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sun, 12 Jul 2015 02:20:45 +0200 Subject: [PATCH] Set system->shutdown to false when loading dummy core --- runloop.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/runloop.c b/runloop.c index 5a1b6dd398..97b65aa210 100644 --- a/runloop.c +++ b/runloop.c @@ -853,6 +853,7 @@ static int rarch_main_iterate_quit(void) { settings_t *settings = config_get_ptr(); global_t *global = global_get_ptr(); + rarch_system_info_t *system = rarch_system_info_get_ptr(); if (global->core_shutdown_initiated && settings->load_dummy_on_core_shutdown) @@ -860,6 +861,7 @@ static int rarch_main_iterate_quit(void) if (!event_command(EVENT_CMD_PREPARE_DUMMY)) return -1; + system->shutdown = false; global->core_shutdown_initiated = false; return 0;