Move global->exec unsetting to the right place

This commit is contained in:
twinaphex 2015-09-26 15:46:36 +02:00
parent 8f7fbb973b
commit e911e91f1b

View File

@ -952,7 +952,6 @@ int rarch_main_iterate(unsigned *sleep_ms)
rarch_main_cmd_get_state(driver, settings, &cmd, input, old_input, trigger_input); rarch_main_cmd_get_state(driver, settings, &cmd, input, old_input, trigger_input);
if (system->frame_time.callback) if (system->frame_time.callback)
rarch_update_frame_time(driver, settings->slowmotion_ratio, system); 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); rarch_main_iterate_linefeed_overlay(driver, settings);
#endif #endif
if (global->exec)
global->exec = false;
{ {
/* Time to exit out of the main loop? /* Time to exit out of the main loop?
* Reasons for exiting: * 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 (shutdown_pressed || frame_count_end || movie_end || !video_alive || global->exec)
{ {
if (global->exec)
global->exec = false;
/* Quits out of RetroArch main loop. /* Quits out of RetroArch main loop.
* On special case, loads dummy core * On special case, loads dummy core
* instead of exiting RetroArch completely. * instead of exiting RetroArch completely.