From 5554e5a842caf06d79dc1c1f3449b620357c6de3 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 18 Mar 2021 12:51:17 +0100
Subject: [PATCH] Small cleanups

---
 menu/menu_defines.h |  1 -
 menu/menu_entries.h |  2 --
 retroarch.c         | 79 ++++++++++++++++++++++++---------------------
 retroarch_data.h    |  2 ++
 4 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/menu/menu_defines.h b/menu/menu_defines.h
index 27e611e2da..55aa741d3f 100644
--- a/menu/menu_defines.h
+++ b/menu/menu_defines.h
@@ -60,7 +60,6 @@ enum rarch_menu_ctl_state
    RARCH_MENU_CTL_SET_PREVENT_POPULATE,
    RARCH_MENU_CTL_UNSET_PREVENT_POPULATE,
    RARCH_MENU_CTL_IS_PREVENT_POPULATE,
-   RARCH_MENU_CTL_FIND_DRIVER,
    RARCH_MENU_CTL_ENVIRONMENT,
    RARCH_MENU_CTL_POINTER_DOWN,
    RARCH_MENU_CTL_POINTER_UP,
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index 405e833b1f..0b585fc6ed 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -72,8 +72,6 @@ enum menu_entry_type
 };
 
 
-typedef struct menu_list menu_list_t;
-
 typedef struct menu_ctx_list
 {
    const char  *path;
diff --git a/retroarch.c b/retroarch.c
index 0ce9685cd3..ab90f964a1 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -5102,42 +5102,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
          menu_entries_flush_stack(NULL, MENU_SETTINGS);
          menu_st->pending_quick_menu = true;
          break;
-      case RARCH_MENU_CTL_FIND_DRIVER:
-         {
-            settings_t *settings = p_rarch->configuration_settings;
-            int i                = (int)driver_find_index(
-                  "menu_driver",
-                  settings->arrays.menu_driver);
-
-            if (i >= 0)
-               p_rarch->menu_driver_ctx = (const menu_ctx_driver_t*)
-                  menu_ctx_drivers[i];
-            else
-            {
-               if (verbosity_is_enabled())
-               {
-                  unsigned d;
-                  RARCH_WARN("Couldn't find any menu driver named \"%s\"\n",
-                        settings->arrays.menu_driver);
-                  RARCH_LOG_OUTPUT("Available menu drivers are:\n");
-                  for (d = 0; menu_ctx_drivers[d]; d++)
-                  {
-                     if (menu_ctx_drivers[d])
-                     {
-                        RARCH_LOG_OUTPUT("\t%s\n", menu_ctx_drivers[d]->ident);
-                     }
-                  }
-                  RARCH_WARN("Going to default to first menu driver...\n");
-               }
-
-               p_rarch->menu_driver_ctx = (const menu_ctx_driver_t*)
-                  menu_ctx_drivers[0];
-
-               if (!p_rarch->menu_driver_ctx)
-                  return false;
-            }
-         }
-         break;
       case RARCH_MENU_CTL_SET_PREVENT_POPULATE:
          menu_st->prevent_populate = true;
          break;
@@ -34949,6 +34913,47 @@ static void retroarch_validate_cpu_features(void)
 #endif
 }
 
+#ifdef HAVE_MENU
+static bool find_menu_driver(
+      struct rarch_state *p_rarch,
+      settings_t *settings)
+{
+   int i                = (int)driver_find_index(
+         "menu_driver",
+         settings->arrays.menu_driver);
+
+   if (i >= 0)
+      p_rarch->menu_driver_ctx = (const menu_ctx_driver_t*)
+         menu_ctx_drivers[i];
+   else
+   {
+      if (verbosity_is_enabled())
+      {
+         unsigned d;
+         RARCH_WARN("Couldn't find any menu driver named \"%s\"\n",
+               settings->arrays.menu_driver);
+         RARCH_LOG_OUTPUT("Available menu drivers are:\n");
+         for (d = 0; menu_ctx_drivers[d]; d++)
+         {
+            if (menu_ctx_drivers[d])
+            {
+               RARCH_LOG_OUTPUT("\t%s\n", menu_ctx_drivers[d]->ident);
+            }
+         }
+         RARCH_WARN("Going to default to first menu driver...\n");
+      }
+
+      p_rarch->menu_driver_ctx = (const menu_ctx_driver_t*)
+         menu_ctx_drivers[0];
+
+      if (!p_rarch->menu_driver_ctx)
+         return false;
+   }
+
+   return true;
+}
+#endif
+
 /**
  * retroarch_main_init:
  * @argc                 : Count of (commandline) arguments.
@@ -35114,7 +35119,7 @@ bool retroarch_main_init(int argc, char *argv[])
    wifi_driver_ctl(RARCH_WIFI_CTL_FIND_DRIVER, NULL);
    find_location_driver(p_rarch);
 #ifdef HAVE_MENU
-   menu_driver_ctl(RARCH_MENU_CTL_FIND_DRIVER, NULL);
+   find_menu_driver(p_rarch, p_rarch->configuration_settings);
 #endif
 
    /* Attempt to initialize core */
diff --git a/retroarch_data.h b/retroarch_data.h
index 61a37ae28d..e68309e1b5 100644
--- a/retroarch_data.h
+++ b/retroarch_data.h
@@ -1587,6 +1587,8 @@ struct menu_list
    size_t selection_buf_size;
 };
 
+typedef struct menu_list menu_list_t;
+
 struct menu_state
 {
    /* Timers */