From 384212470a01245a3bb8eb5f85ba7a0c3b7e5e5f Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Sun, 10 Mar 2013 21:13:17 +0100
Subject: [PATCH] Avoid delay timer in rarch_main_iterate.

---
 retroarch.c | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 7475b533cc..efb4779c60 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2848,6 +2848,27 @@ error:
    return 1;
 }
 
+static inline bool check_enter_rgui(void)
+{
+   static bool old_rmenu_toggle = true;
+   bool rmenu_toggle = input_key_pressed_func(RARCH_MENU_TOGGLE);
+   if (rmenu_toggle && !old_rmenu_toggle)
+   {
+      if (input_key_pressed_func(RARCH_MENU_QUICKMENU_TOGGLE))
+         g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME);
+
+      g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
+      g_extern.delay_timer[0] = g_extern.frame_count + 30; // FIXME: Purge. Should do something similar in RGUI as well.
+      old_rmenu_toggle = true;
+      return true;
+   }
+   else
+   {
+      old_rmenu_toggle = rmenu_toggle;
+      return false;
+   }
+}
+
 bool rarch_main_iterate(void)
 {
 #ifdef HAVE_DYLIB
@@ -2870,15 +2891,8 @@ bool rarch_main_iterate(void)
       return false;
    }
 
-   if (input_key_pressed_func(RARCH_MENU_TOGGLE) && g_extern.frame_count >= g_extern.delay_timer[0])
-   {
-      if (input_key_pressed_func(RARCH_MENU_QUICKMENU_TOGGLE))
-         g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_INGAME);
-
-      g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU);
-      g_extern.delay_timer[0] = g_extern.frame_count + 30;
-      return false;
-   }
+   if (check_enter_rgui())
+      return false; // Enter menu, don't exit.
 
 #ifdef HAVE_COMMAND
    if (driver.command)