From 1e4cd8abe00cf354ba9e92066464a8eafc74adb7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 21 Sep 2014 04:48:37 +0200
Subject: [PATCH] Move frame_time_last= 0 to rarch_set_action_state

---
 retroarch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retroarch.c b/retroarch.c
index e703327462..ae073c25af 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -3177,6 +3177,7 @@ void rarch_main_set_state(unsigned cmd)
    {
       case RARCH_ACTION_STATE_MENU_PREINIT:
          g_extern.lifecycle_state |= (1ULL << MODE_MENU_PREINIT);
+         g_extern.system.frame_time_last = 0;
          break;
       case RARCH_ACTION_STATE_MENU_PREINIT_FINISHED:
          g_extern.lifecycle_state &= ~(1ULL << MODE_MENU_PREINIT);
@@ -3602,7 +3603,6 @@ bool rarch_main_iterate(void)
    {
       /* Always go into menu if dummy core is loaded. */
       rarch_main_set_state(RARCH_ACTION_STATE_MENU_PREINIT);
-      g_extern.system.frame_time_last = 0;
       return false; /* Enter menu, don't exit. */
    }