Some control flow changes in rarch_main_iterate

This commit is contained in:
twinaphex 2015-01-11 18:04:42 +01:00
parent 8f41438410
commit 7198d658bb

View File

@ -885,10 +885,7 @@ int rarch_main_iterate(void)
trigger_input = input & ~old_input; trigger_input = input & ~old_input;
if (time_to_exit(input)) if (time_to_exit(input))
{ return rarch_main_iterate_quit();
ret = -1;
goto quit;
}
if (g_extern.system.frame_time.callback) if (g_extern.system.frame_time.callback)
update_frame_time(); update_frame_time();
@ -910,8 +907,7 @@ int rarch_main_iterate(void)
if (g_extern.exec) if (g_extern.exec)
{ {
g_extern.exec = false; g_extern.exec = false;
ret = -1; return rarch_main_iterate_quit();
goto quit;
} }
if (do_state_checks(input, old_input, trigger_input)) if (do_state_checks(input, old_input, trigger_input))
@ -920,8 +916,7 @@ int rarch_main_iterate(void)
driver.retro_ctx.poll_cb(); driver.retro_ctx.poll_cb();
rarch_sleep(10); rarch_sleep(10);
ret = 1; return 1;
goto quit;
} }
#if defined(HAVE_THREADS) #if defined(HAVE_THREADS)
@ -983,9 +978,5 @@ success:
if (g_settings.fastforward_ratio_throttle_enable) if (g_settings.fastforward_ratio_throttle_enable)
limit_frame_time(); limit_frame_time();
quit: return ret;
if (ret != -1)
return ret;
return rarch_main_iterate_quit();
} }