From 3472987d9fe37585294d5d8867e9c4b6b9b77050 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 4 Oct 2014 13:47:26 +0200
Subject: [PATCH] Use a goto in rarch_main_iterate

---
 retroarch.c | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 301120e9a8..f656bcdbca 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3202,19 +3202,6 @@ static void do_state_check_menu_toggle(void)
 
    rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
 }
-
-static int do_menu_oneshot(
-      retro_input_t input, retro_input_t old_input,
-      retro_input_t trigger_input)
-{
-   if (!menu_iterate(input, old_input, trigger_input))
-      rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
-   
-   if (g_settings.fastforward_ratio_throttle_enable)
-      limit_frame_time();
-
-   return 0;
-}
 #endif
 
 static inline int time_to_exit(retro_input_t input)
@@ -3266,7 +3253,12 @@ int rarch_main_iterate(void)
       do_state_check_menu_toggle();
 
    if (g_extern.is_menu)
-      return do_menu_oneshot(input, old_input, trigger_input);
+   {
+      if (!menu_iterate(input, old_input, trigger_input))
+         rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
+
+      goto success;
+   }
 #endif
 
    if (g_extern.exec)
@@ -3341,6 +3333,7 @@ int rarch_main_iterate(void)
    unlock_autosave();
 #endif
 
+success:
    if (g_settings.fastforward_ratio_throttle_enable)
       limit_frame_time();