From e97de06f244a626b0433efce51c39da265d622ba Mon Sep 17 00:00:00 2001
From: radius <andres.430@gmail.com>
Date: Mon, 15 Feb 2016 22:48:35 -0500
Subject: [PATCH] add a fallback for cases when an autoconf is present but it
 doesn't have descriptors

---
 input/input_config.c          | 6 +++---
 menu/cbs/menu_cbs_get_value.c | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/input/input_config.c b/input/input_config.c
index 2156fcf1ed..84b5f86e2d 100644
--- a/input/input_config.c
+++ b/input/input_config.c
@@ -394,7 +394,7 @@ static void input_config_get_bind_string_joykey(char *buf, const char *prefix,
             && settings->input.input_descriptor_label_show)
          snprintf(buf, size, "%s %s ", prefix, bind->joykey_label);
       else
-         snprintf(buf, size, "%sHat #%u %s ", prefix,
+         snprintf(buf, size, "%sHat #%u %s (N/A)", prefix,
                (unsigned)GET_HAT(bind->joykey), dir);
    }
    else
@@ -403,7 +403,7 @@ static void input_config_get_bind_string_joykey(char *buf, const char *prefix,
             && settings->input.input_descriptor_label_show)
          snprintf(buf, size, "%s%s (btn) ", prefix, bind->joykey_label);
       else
-         snprintf(buf, size, "%s%u (btn) ", prefix, (unsigned)bind->joykey);
+         snprintf(buf, size, "%s%u (btn)(N/A) ", prefix, (unsigned)bind->joykey);
    }
 }
 
@@ -428,7 +428,7 @@ static void input_config_get_bind_string_joyaxis(char *buf, const char *prefix,
          && settings->input.input_descriptor_label_show)
       snprintf(buf, size, "%s%s (axis) ", prefix, bind->joyaxis_label);
    else
-      snprintf(buf, size, "%s%c%u (axis) ", prefix, dir, axis);
+      snprintf(buf, size, "%s%c%u (axis)(N/A) ", prefix, dir, axis);
 }
 
 void input_config_get_bind_string(char *buf, const struct retro_keybind *bind,
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index aa1eeafbaf..1cd09dfb07 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -403,7 +403,7 @@ static void menu_action_setting_disp_set_label_input_desc(
 
    if (inp_desc_button_index_offset < RARCH_FIRST_CUSTOM_BIND)
    {
-      if(strstr(descriptor,"Auto"))
+      if(strstr(descriptor,"Auto") && !strstr(descriptor,"(N/A)"))
          strlcpy(s, 
             descriptor,
             len);