From 195c9f6ab677df5865c3111998364a9da1aaecbd Mon Sep 17 00:00:00 2001
From: jdgleaver <james@leaver.myzen.co.uk>
Date: Thu, 2 Jan 2020 09:48:09 +0000
Subject: [PATCH] Ensure core info is always initialised when calling
 'drivers_init()'

---
 retroarch.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/retroarch.c b/retroarch.c
index 27238e7167..360762985c 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -23170,6 +23170,17 @@ static void drivers_init(int flags)
          if (!menu_driver_init(video_is_threaded))
              RARCH_ERR("Unable to init menu driver.\n");
    }
+
+   /* Initialising the menu driver will also initialise
+    * core info - if we are not initialising the menu
+    * driver, must initialise core info 'by hand' */
+   if (!(flags & DRIVER_VIDEO_MASK) ||
+       !(flags & DRIVER_MENU_MASK))
+   {
+      command_event(CMD_EVENT_CORE_INFO_INIT, NULL);
+      command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+   }
+
 #else
    /* Qt uses core info, even if the menu is disabled */
    command_event(CMD_EVENT_CORE_INFO_INIT, NULL);