From b6d5449ae640160f7c5f9c332422b3d27c7c3b2d Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 14 Nov 2015 23:27:05 -0500 Subject: [PATCH] allow user defined autoconf files to take precedence over builtin --- input/input_autodetect.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/input/input_autodetect.c b/input/input_autodetect.c index b3e7211ba7..56192916d6 100644 --- a/input/input_autodetect.c +++ b/input/input_autodetect.c @@ -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; }