From a93b99b919a690f90f21c3947f549514ef8b28ae Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sat, 24 Aug 2019 08:31:07 +0200
Subject: [PATCH] Hook up start button to 'Load Core' - will unload a core

---
 menu/cbs/menu_cbs_ok.c    |  2 +-
 menu/cbs/menu_cbs_start.c | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index b1e09656f2..551052e020 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1410,7 +1410,7 @@ static int set_path_generic(const char *label, const char *action_path)
    return 0;
 }
 
-static int generic_action_ok_command(enum event_command cmd)
+int generic_action_ok_command(enum event_command cmd)
 {
 #ifdef HAVE_AUDIOMIXER
    settings_t *settings = config_get_ptr();
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index 8d0ac72df0..2ce147d47f 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -49,6 +49,8 @@
    cbs->action_start_ident = #name;
 #endif
 
+int generic_action_ok_command(enum event_command cmd);
+
 #ifdef HAVE_AUDIOMIXER
 static int action_start_audio_mixer_stream_volume(unsigned type, const char *label)
 {
@@ -323,6 +325,17 @@ static int action_start_video_resolution(unsigned type, const char *label)
    return 0;
 }
 
+static int action_start_load_core(unsigned type, const char *label)
+{
+   int ret                     = generic_action_ok_command(
+         CMD_EVENT_UNLOAD_CORE);
+   bool refresh                = false;
+
+   menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
+   menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
+   return 0;
+}
+
 static int action_start_lookup_setting(unsigned type, const char *label)
 {
    return menu_setting_set(type, MENU_ACTION_START, false);
@@ -334,6 +347,9 @@ static int menu_cbs_init_bind_start_compare_label(menu_file_list_cbs_t *cbs)
    {
       switch (cbs->enum_idx)
       {
+         case MENU_ENUM_LABEL_CORE_LIST:
+            BIND_ACTION_START(cbs, action_start_load_core);
+            break;
          case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET:
             BIND_ACTION_START(cbs, action_start_shader_preset);
             break;