From 1111bd2f6d78defb704c332a393efaf2579d4a8c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 5 Sep 2014 18:21:03 +0200
Subject: [PATCH] (Menu) Move early return when core is a dummy to
 menu_history_push_current function

---
 frontend/frontend.c         | 8 +-------
 frontend/menu/menu_common.c | 3 +++
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/frontend/frontend.c b/frontend/frontend.c
index 4a2a22d029..1b7b1813e2 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -376,13 +376,7 @@ returntype main_entry(signature())
 #if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
    if (ret)
 #endif
-   {
-      /* If we started content directly from command line,
-       * push it to content history.
-       */
-      if (!g_extern.libretro_dummy)
-         menu_content_history_push_current();
-   }
+      menu_content_history_push_current();
 #else
    frontend_loop = main_entry_iterate_content_nomenu;
 #endif
diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index c19625cefd..c022eed019 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -62,6 +62,9 @@ void menu_content_history_push_current(void)
    if (!g_extern.history)
       return;
 
+   if (!g_extern.libretro_dummy)
+      return;
+
    /* g_extern.fullpath can be relative here.
     * Ensure we're pushing absolute path. */