From 115c8cdf12918b9916e103c7493d1c5034f989a7 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 24 Sep 2015 20:56:54 +0200
Subject: [PATCH] Create menu_input_set_binds_minmax

---
 menu/menu_input.c   | 11 +++++++++++
 menu/menu_input.h   |  2 ++
 menu/menu_setting.c |  7 ++-----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/menu/menu_input.c b/menu/menu_input.c
index 10b7b609f8..286fe1b25b 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -1031,6 +1031,17 @@ static int menu_input_pointer_post_iterate(menu_file_list_cbs_t *cbs,
    return ret;
 }
 
+void menu_input_set_binds_minmax(unsigned min, unsigned max)
+{
+   menu_input_t *menu_input  = menu_input_get_ptr();
+
+   if (!menu_input)
+      return;
+
+   menu_input->binds.begin = min;
+   menu_input->binds.last  = max;
+}
+
 void menu_input_post_iterate(int *ret, unsigned action)
 {
    menu_entry_t entry        = {{0}};
diff --git a/menu/menu_input.h b/menu/menu_input.h
index 677ebc6ccc..6cafbd8da8 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -233,6 +233,8 @@ int16_t menu_input_mouse_state(enum menu_input_mouse_state state);
 
 bool menu_input_ctl(enum menu_ctl_state state, void *data);
 
+void menu_input_set_binds_minmax(unsigned min, unsigned max);
+
 menu_input_t *menu_input_get_ptr(void);
 
 #ifdef __cplusplus
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 89a0512638..c9c6b7967f 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -996,14 +996,11 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound)
    struct retro_keybind *target = NULL;
    const struct retro_keybind *def_binds = NULL;
    rarch_setting_t *setting  = (rarch_setting_t*)data;
-   menu_input_t *menu_input  = menu_input_get_ptr();
    settings_t    *settings   = config_get_ptr();
    global_t      *global     = global_get_ptr();
 
    (void)wraparound;
 
-   if (!menu_input)
-      return -1;
    if (!setting)
       return -1;
 
@@ -1015,8 +1012,8 @@ static int setting_action_ok_bind_defaults(void *data, bool wraparound)
    if (!target)
       return -1;
 
-   menu_input->binds.begin = MENU_SETTINGS_BIND_BEGIN;
-   menu_input->binds.last  = MENU_SETTINGS_BIND_LAST;
+   menu_input_set_binds_minmax(
+         MENU_SETTINGS_BIND_BEGIN, MENU_SETTINGS_BIND_LAST);
 
    for (i = MENU_SETTINGS_BIND_BEGIN;
          i <= MENU_SETTINGS_BIND_LAST; i++, target++)