mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-10 07:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input_autodetect) Cleanups pt. 5

Browse Source
This commit is contained in:
twinaphex 2015-03-27 17:47:15 +01:00
parent 6917982686
commit 948e9a1888
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
input/input_autodetect.c
View File

@ -127,7 +127,7 @@ static bool input_autoconfigure_joypad_from_conf(
void input_config_autoconfigure_joypad(autoconfig_params_t *params) void input_config_autoconfigure_joypad(autoconfig_params_t *params)
{ {
size_t i; size_t i;
bool internal_only; bool ret = false;
struct string_list *list = NULL; struct string_list *list = NULL;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
@ -146,23 +146,23 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
if (!params->name) if (!params->name)
return; return;
/* if false, load from both cfg files and internal */
internal_only = !*settings->input.autoconfig_dir;
#if defined(HAVE_BUILTIN_AUTOCONFIG) #if defined(HAVE_BUILTIN_AUTOCONFIG)
/* First internal */ /* First internal */
for (i = 0; input_builtin_autoconfs[i]; i++) for (i = 0; input_builtin_autoconfs[i]; i++)
{ {
config_file_t *conf = (config_file_t*) config_file_t *conf = config_file_new_from_string(
config_file_new_from_string(input_builtin_autoconfs[i]); input_builtin_autoconfs[i]);
if (input_autoconfigure_joypad_from_conf(conf, params))
if ((ret = input_autoconfigure_joypad_from_conf(conf, params)))
break; break;
} }
#endif #endif
if (internal_only) if (ret || !*settings->input.autoconfig_dir)
return; return;
/* Load from both cfg files and internal */
/* Now try files */ /* Now try files */
list = dir_list_new(settings->input.autoconfig_dir, "cfg", false); list = dir_list_new(settings->input.autoconfig_dir, "cfg", false);
@ -172,7 +172,8 @@ void input_config_autoconfigure_joypad(autoconfig_params_t *params)
for (i = 0; i < list->size; i++) for (i = 0; i < list->size; i++)
{ {
config_file_t *conf = config_file_new(list->elems[i].data); config_file_t *conf = config_file_new(list->elems[i].data);
if (input_autoconfigure_joypad_from_conf(conf, params))
if ((ret = input_autoconfigure_joypad_from_conf(conf, params)))
break; break;
} }