allow user defined autoconf files to take precedence over builtin

This commit is contained in:
radius 2015-11-14 23:27:05 -05:00
parent a840a081fb
commit b6d5449ae6

View File

@ -305,13 +305,14 @@ bool input_config_autoconfigure_joypad(autoconfig_params_t *params)
if (!*params->name)
return ret;
#if defined(HAVE_BUILTIN_AUTOCONFIG)
ret = input_autoconfigure_joypad_from_conf_internal(params);
#endif
if (!ret)
ret = input_autoconfigure_joypad_from_conf_dir(params);
#if defined(HAVE_BUILTIN_AUTOCONFIG)
if (!ret)
ret = input_autoconfigure_joypad_from_conf_internal(params);
#endif
return ret;
}