From 93d51f428ff49a0ff1e7bcb6eda6948112a57293 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 25 Jan 2015 06:17:55 +0100
Subject: [PATCH] Cleanups

---
 menu/menu_action.c      |  6 +++---
 menu/menu_action.h      |  2 ++
 menu/menu_entries_cbs.c | 15 ---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/menu/menu_action.c b/menu/menu_action.c
index bec834d2df..c52c7c027e 100644
--- a/menu/menu_action.c
+++ b/menu/menu_action.c
@@ -18,7 +18,7 @@
 #include "menu_entries.h"
 #include "../retroarch.h"
 
-static int setting_extra_handler(rarch_setting_t *setting)
+int menu_action_generic_setting(rarch_setting_t *setting)
 {
    if (!setting)
       return -1;
@@ -77,7 +77,7 @@ int menu_action_setting_handler(rarch_setting_t *setting, unsigned action)
 {
    process_setting_handler(setting, action);
 
-   return setting_extra_handler(setting);
+   return menu_action_generic_setting(setting);
 }
 
 int menu_action_handle_setting(rarch_setting_t *setting,
@@ -111,7 +111,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
          break;
    }
 
-   return setting_extra_handler(setting);
+   return menu_action_generic_setting(setting);
 }
 
 rarch_setting_t *menu_action_find_setting(const char *label)
diff --git a/menu/menu_action.h b/menu/menu_action.h
index 1f88cecf34..237723bd53 100644
--- a/menu/menu_action.h
+++ b/menu/menu_action.h
@@ -23,6 +23,8 @@
 extern "C" {
 #endif
 
+int menu_action_generic_setting(rarch_setting_t *setting);
+
 int menu_action_setting_handler(
       rarch_setting_t *setting, unsigned action);
 
diff --git a/menu/menu_entries_cbs.c b/menu/menu_entries_cbs.c
index a204ca68b4..3449f4dff4 100644
--- a/menu/menu_entries_cbs.c
+++ b/menu/menu_entries_cbs.c
@@ -124,21 +124,6 @@ unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
 unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
 #endif
 
-static int menu_action_generic_setting(rarch_setting_t *setting)
-{
-   if (setting->change_handler)
-      setting->change_handler(setting);
-
-   if (setting->flags & SD_FLAG_EXIT
-         && setting->cmd_trigger.triggered)
-   {
-      setting->cmd_trigger.triggered = false;
-      return -1;
-   }
-
-   return 0;
-}
-
 int menu_action_setting_set_current_string(
       rarch_setting_t *setting, const char *str)
 {