From f8d64b703e20900fcf120db386894dd92af19f76 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 4 Oct 2016 07:39:41 +0200 Subject: [PATCH] Simplify input_autoconfigure_joypad_from_conf_internal --- input/input_autodetect.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/input/input_autodetect.c b/input/input_autodetect.c index 1d5dd2ef1d..405a43e34f 100644 --- a/input/input_autodetect.c +++ b/input/input_autodetect.c @@ -259,19 +259,18 @@ static bool input_autoconfigure_joypad_from_conf_internal( { size_t i; settings_t *settings = config_get_ptr(); - bool ret = false; /* Load internal autoconfig files */ for (i = 0; input_builtin_autoconfs[i]; i++) { config_file_t *conf = config_file_new_from_string( input_builtin_autoconfs[i]); - - if ((ret = input_autoconfigure_joypad_from_conf(conf, params))) - break; + bool ret = input_autoconfigure_joypad_from_conf(conf, params); + if (ret) + return true; } - if (ret || !*settings->directory.autoconfig) + if (string_is_empty(settings->directory.autoconfig)) return true; return false; }