From ff07d3569b5f90b23fe6b512c292446f5ccbc4b9 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 17 Aug 2016 12:51:26 +0200
Subject: [PATCH] Move menu_update_libretro_info to menu_driver.c

---
 driver.c           | 23 -----------------------
 menu/menu_driver.c | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/driver.c b/driver.c
index 3bc36e50af..0b5436fc59 100644
--- a/driver.c
+++ b/driver.c
@@ -270,27 +270,6 @@ static bool driver_update_system_av_info(const struct retro_system_av_info *info
    return true;
 }
 
-#ifdef HAVE_MENU
-/**
- * menu_update_libretro_info:
- *
- * Update menu state which depends on config.
- **/
-static void menu_update_libretro_info(void)
-{
-   struct retro_system_info *info = NULL;
-   
-   menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET,
-         &info);
-   
-   if (!info)
-      return;
-
-   command_event(CMD_EVENT_CORE_INFO_INIT, NULL);
-   command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
-}
-#endif
-
 /**
  * init_drivers:
  * @flags              : Bitmask of drivers to initialize.
@@ -350,8 +329,6 @@ static void init_drivers(int flags)
       init_location();
 
 #ifdef HAVE_MENU
-   menu_update_libretro_info();
-
    if (flags & DRIVER_MENU)
    {
       menu_driver_ctl(RARCH_MENU_CTL_INIT, NULL);
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 1a3f647723..4a12bbc409 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -283,6 +283,25 @@ const char *menu_driver_ident(void)
   return menu_driver_ctx->ident;
 }
 
+/**
+ * menu_update_libretro_info:
+ *
+ * Update menu state which depends on config.
+ **/
+static void menu_update_libretro_info(void)
+{
+   struct retro_system_info *info = NULL;
+   
+   menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET,
+         &info);
+   
+   if (!info)
+      return;
+
+   command_event(CMD_EVENT_CORE_INFO_INIT, NULL);
+   command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+}
+
 bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
 {
    switch (state)
@@ -555,6 +574,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
       case RARCH_MENU_CTL_INIT:
          {
             settings_t *settings  = config_get_ptr();
+            menu_update_libretro_info();
             if (menu_driver_data)
                return true;