From 6a845dec645914a00441c66d6baf09d66cf22500 Mon Sep 17 00:00:00 2001
From: twinaphex <autechre1024@hotmail.com>
Date: Tue, 9 Apr 2013 09:16:23 +0200
Subject: [PATCH] (RMenu) Fix - Pops menu stack for a submenu - hack - needs a
 cleaner implementation

---
 frontend/menu/rmenu.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index 435196e2f0..ac8b5577a4 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -3115,6 +3115,16 @@ static int menu_input_process(uint8_t menu_type, uint64_t old_state)
 
       if (return_to_game_enable)
       {
+         /* TODO : need to make a 'parent' menu_type of some sort so that we have
+          * a cleaner way of telling RMenu that the menu stack should be popped
+          * for a submenu when doing the menu quit hotkey */
+         if (menu_type == INGAME_MENU_CORE_OPTIONS | menu_type == INGAME_MENU_RESIZE
+               || menu_type == LIBRETRO_CHOICE)
+         {
+            menu_stack_pop();
+            g_extern.lifecycle_mode_state |= (1ULL << MODE_MENU_DRAW);
+         }
+
          int ret = -1;
          if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU_INGAME))
          {