ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6090 from fr500/master 

fix my last PR for builtin autoconfs
This commit is contained in:
Twinaphex 2018-01-12 16:32:43 +01:00 committed by GitHub
parent 39cc418e2e 2e210b6bb4
commit 2064a98dfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tasks/task_autodetect.c
View File

@ -275,8 +275,14 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
task_set_title(task, strdup(msg)); task_set_title(task, strdup(msg));
} }
} }
input_config_set_device_display_name(params->idx, display_name); if (!string_is_empty(display_name))
input_config_set_device_config_name(params->idx, path_basename(conf->path)); input_config_set_device_display_name(params->idx, display_name);
else
input_config_set_device_display_name(params->idx, "N/A");
if (!string_is_empty(conf->path))
input_config_set_device_config_name(params->idx, path_basename(conf->path));
else
input_config_set_device_config_name(params->idx, "N/A");
input_autoconfigure_joypad_reindex_devices(); input_autoconfigure_joypad_reindex_devices();