From f938c75e0b6de47130a232b34f3a159d7db4d281 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 16 Jul 2015 11:57:50 +0200
Subject: [PATCH] When 'Hide In Menu' is enabled, overlay should reappear now
 when we select 'Resume Content', 'Load State', or 'Save State'

---
 retroarch.c | 8 ++++++++
 runloop.c   | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/retroarch.c b/retroarch.c
index 7ece42289c..18b3a28fef 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1399,6 +1399,10 @@ void rarch_main_set_state(unsigned cmd)
 
          menu_entries_set_refresh();
          menu_driver_set_alive();
+#endif
+#ifdef HAVE_OVERLAY
+         if (settings->input.overlay_hide_in_menu)
+            event_command(EVENT_CMD_OVERLAY_DEINIT);
 #endif
          break;
       case RARCH_ACTION_STATE_LOAD_CONTENT:
@@ -1450,6 +1454,10 @@ void rarch_main_set_state(unsigned cmd)
             system->key_event = global->frontend_key_event;
 #endif
          video_driver_set_texture_enable(false, false);
+#ifdef HAVE_OVERLAY
+         if (settings->input.overlay_hide_in_menu)
+            event_command(EVENT_CMD_OVERLAY_INIT);
+#endif
          break;
       case RARCH_ACTION_STATE_QUIT:
 	     if (global)
diff --git a/runloop.c b/runloop.c
index fe468b86f8..b200be45cc 100644
--- a/runloop.c
+++ b/runloop.c
@@ -424,18 +424,11 @@ static void do_state_check_menu_toggle(settings_t *settings, global_t *global)
    if (menu_driver_alive())
    {
       if (global->main_is_init && (global->core_type != CORE_TYPE_DUMMY))
-      {
          rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
-         if (settings->input.overlay_hide_in_menu)
-            event_command(EVENT_CMD_OVERLAY_INIT);
-      }
       return;
    }
 
    rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING);
-
-   if (settings->input.overlay_hide_in_menu)
-      event_command(EVENT_CMD_OVERLAY_DEINIT);
 }
 #endif