Merge pull request #6126 from fr500/master

fix display name for builtin autoconfs again
This commit is contained in:
Andrés 2018-01-16 22:20:17 -05:00 committed by GitHub
commit 78adf0cca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -278,7 +278,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
if (!string_is_empty(display_name))
input_config_set_device_display_name(params->idx, display_name);
else
input_config_set_device_display_name(params->idx, "N/A");
input_config_set_device_display_name(params->idx, params->name);
if (!string_is_empty(conf->path))
input_config_set_device_config_name(params->idx, path_basename(conf->path));
else