From 1bf76bc1f663ce6641507fe200ffecd2721828b5 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 18 Mar 2016 23:31:11 +0100
Subject: [PATCH] Create MENU_SETTING_CTL_ACTION_RIGHT

---
 menu/menu_entry.c   |  2 +-
 menu/menu_setting.c | 20 ++++++++++----------
 menu/menu_setting.h |  5 ++---
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/menu/menu_entry.c b/menu/menu_entry.c
index 10baf1207a..2a58e57fd3 100644
--- a/menu/menu_entry.c
+++ b/menu/menu_entry.c
@@ -188,7 +188,7 @@ void menu_entry_pathdir_selected(uint32_t i)
    rarch_setting_t *setting = menu_entries_get_setting(i);
 
    if (menu_setting_ctl(MENU_SETTING_CTL_IS_OF_PATH_TYPE, (void*)setting))
-      menu_setting_action_right(setting, false);
+      menu_setting_ctl(MENU_SETTING_CTL_ACTION_RIGHT, setting);
 }
 
 bool menu_entry_pathdir_allow_empty(uint32_t i)
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index b70b583c75..702c63a0f5 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -7347,16 +7347,6 @@ static bool setting_append_list_privacy_options(
    return true;
 }
 
-
-bool menu_setting_action_right(rarch_setting_t *setting, bool wraparound)
-{
-   if (!setting || !setting->action_right)
-      return false;
-
-   setting->action_right(setting, wraparound);
-   return true;
-}
-
 static bool menu_setting_free(void *data)
 {
    rarch_setting_t *setting = (rarch_setting_t*)data;
@@ -7580,6 +7570,16 @@ bool menu_setting_ctl(enum menu_setting_ctl_state state, void *data)
             *setting = menu_setting_new();
          }
          break;
+      case MENU_SETTING_CTL_ACTION_RIGHT:
+         {
+            bool wraparound = false;
+            rarch_setting_t *setting = (rarch_setting_t*)data;
+            if (!setting || !setting->action_right)
+               return false;
+
+            setting->action_right(setting, wraparound);
+         }
+         break;
       case MENU_SETTING_CTL_NONE:
       default:
          break;
diff --git a/menu/menu_setting.h b/menu/menu_setting.h
index 8962483d17..bf3eb3f7a1 100644
--- a/menu/menu_setting.h
+++ b/menu/menu_setting.h
@@ -68,7 +68,8 @@ enum menu_setting_ctl_state
    MENU_SETTING_CTL_NONE = 0,
    MENU_SETTING_CTL_FREE,
    MENU_SETTING_CTL_NEW,
-   MENU_SETTING_CTL_IS_OF_PATH_TYPE
+   MENU_SETTING_CTL_IS_OF_PATH_TYPE,
+   MENU_SETTING_CTL_ACTION_RIGHT
 };
 
 enum setting_list_flags
@@ -348,8 +349,6 @@ unsigned menu_setting_get_index_offset(rarch_setting_t *setting);
 
 void *setting_get_ptr(rarch_setting_t *setting);
 
-bool menu_setting_action_right(rarch_setting_t *setting, bool wraparound);
-
 void menu_settings_list_increment(rarch_setting_t **list);
 
 void general_write_handler(void *data);