From e911e91f1b7ce83e1dc70f5de17e88dd1d59a65b Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 26 Sep 2015 15:46:36 +0200 Subject: [PATCH] Move global->exec unsetting to the right place --- runloop.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/runloop.c b/runloop.c index 2deffb75ac..a8ea160e3d 100644 --- a/runloop.c +++ b/runloop.c @@ -952,7 +952,6 @@ int rarch_main_iterate(unsigned *sleep_ms) rarch_main_cmd_get_state(driver, settings, &cmd, input, old_input, trigger_input); - if (system->frame_time.callback) rarch_update_frame_time(driver, settings->slowmotion_ratio, system); @@ -977,9 +976,6 @@ int rarch_main_iterate(unsigned *sleep_ms) rarch_main_iterate_linefeed_overlay(driver, settings); #endif - if (global->exec) - global->exec = false; - { /* Time to exit out of the main loop? * Reasons for exiting: @@ -997,6 +993,9 @@ int rarch_main_iterate(unsigned *sleep_ms) if (shutdown_pressed || frame_count_end || movie_end || !video_alive || global->exec) { + if (global->exec) + global->exec = false; + /* Quits out of RetroArch main loop. * On special case, loads dummy core * instead of exiting RetroArch completely.