This commit is contained in:
twinaphex 2017-04-25 18:32:08 +02:00
parent 8d0e3d7777
commit 87f05b3a7b
1 changed files with 2 additions and 2 deletions

View File

@ -453,6 +453,7 @@ static void input_config_get_bind_string_joyaxis(char *buf, const char *prefix,
unsigned axis = 0; unsigned axis = 0;
char dir = '\0'; char dir = '\0';
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool label_show = settings->input.input_descriptor_label_show;
if (AXIS_NEG_GET(bind->joyaxis) != AXIS_DIR_NONE) if (AXIS_NEG_GET(bind->joyaxis) != AXIS_DIR_NONE)
{ {
@ -464,8 +465,7 @@ static void input_config_get_bind_string_joyaxis(char *buf, const char *prefix,
dir = '+'; dir = '+';
axis = AXIS_POS_GET(bind->joyaxis); axis = AXIS_POS_GET(bind->joyaxis);
} }
if (!string_is_empty(bind->joyaxis_label) if (!string_is_empty(bind->joyaxis_label) && label_show)
&& settings->input.input_descriptor_label_show)
snprintf(buf, size, "%s%s (axis) ", prefix, bind->joyaxis_label); snprintf(buf, size, "%s%s (axis) ", prefix, bind->joyaxis_label);
else else
snprintf(buf, size, "%s%c%u (%s) ", prefix, dir, axis, snprintf(buf, size, "%s%c%u (%s) ", prefix, dir, axis,