From bb7b3a0d704ed28f53f81a4d4c4c4be0a24c0e21 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 8 Oct 2014 18:26:46 +0200
Subject: [PATCH] Add RARCH_CMD_OVERLAY_NEXT

---
 frontend/menu/menu_common.c | 4 +---
 general.h                   | 1 +
 retroarch.c                 | 5 +++++
 runloop.c                   | 4 +---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index e4142cfd4a..b57a68d2d5 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -310,10 +310,8 @@ int menu_iterate(retro_input_t input,
    if (!driver.menu)
       return -1;
 
-#ifdef HAVE_OVERLAY
    if (BIT64_GET(trigger_input, RARCH_OVERLAY_NEXT))
-         input_overlay_next(driver.overlay);
-#endif
+      rarch_main_command(RARCH_CMD_OVERLAY_NEXT);
    if (BIT64_GET(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
       rarch_main_command(RARCH_CMD_FULLSCREEN_TOGGLE);
 
diff --git a/general.h b/general.h
index e217880fa3..85e8194235 100644
--- a/general.h
+++ b/general.h
@@ -113,6 +113,7 @@ enum basic_event
    RARCH_CMD_OVERLAY_DEINIT,
    RARCH_CMD_OVERLAY_SET_SCALE_FACTOR,
    RARCH_CMD_OVERLAY_SET_ALPHA_MOD,
+   RARCH_CMD_OVERLAY_NEXT,
    RARCH_CMD_DSP_FILTER_INIT,
    RARCH_CMD_DSP_FILTER_DEINIT,
    RARCH_CMD_GPU_RECORD_DEINIT,
diff --git a/retroarch.c b/retroarch.c
index eeba7966c4..3a575af9f0 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2336,6 +2336,11 @@ bool rarch_main_command(unsigned cmd)
          driver.overlay = input_overlay_new(g_settings.input.overlay);
          if (!driver.overlay)
             RARCH_ERR("Failed to load overlay.\n");
+#endif
+         break;
+      case RARCH_CMD_OVERLAY_NEXT:
+#ifdef HAVE_OVERLAY
+         input_overlay_next(driver.overlay);
 #endif
          break;
       case RARCH_CMD_DSP_FILTER_DEINIT:
diff --git a/runloop.c b/runloop.c
index fc00874b9e..c4cf1d3438 100644
--- a/runloop.c
+++ b/runloop.c
@@ -373,10 +373,8 @@ static int do_state_checks(
    if (BIT64_GET(trigger_input, RARCH_GRAB_MOUSE_TOGGLE))
       rarch_main_command(RARCH_CMD_GRAB_MOUSE_TOGGLE);
 
-#ifdef HAVE_OVERLAY
    if (BIT64_GET(trigger_input, RARCH_OVERLAY_NEXT))
-      input_overlay_next(driver.overlay);
-#endif
+      rarch_main_command(RARCH_CMD_OVERLAY_NEXT);
 
    if (!g_extern.is_paused)
    {