From 805b36834517c08533c9e87d3bc5acbe89ba53cd Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 14 Nov 2015 23:49:26 -0500 Subject: [PATCH] print a not configured message only if both builtin and file based autoconfs are not present --- input/input_autodetect.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/input/input_autodetect.c b/input/input_autodetect.c index 56192916d6..ce396d6541 100644 --- a/input/input_autodetect.c +++ b/input/input_autodetect.c @@ -236,14 +236,8 @@ static bool input_autoconfigure_joypad_from_conf_dir( ret = 1; } else - { - char msg[PATH_MAX_LENGTH]; - - RARCH_LOG("Autodetect: no profiles found for %s (%d/%d)", params->name, params->vid, params->pid); - snprintf(msg, sizeof(msg), "%s (%ld/%ld) not configured", params->name, (long)params->vid, (long)params->pid); - rarch_main_msg_queue_push(msg, 0, 60, false); ret = 0; - } + string_list_free(list); if (ret == 0) @@ -312,7 +306,14 @@ bool input_config_autoconfigure_joypad(autoconfig_params_t *params) if (!ret) ret = input_autoconfigure_joypad_from_conf_internal(params); #endif + if (!ret) + { + char msg[PATH_MAX_LENGTH]; + RARCH_LOG("Autodetect: no profiles found for %s (%d/%d)", params->name, params->vid, params->pid); + snprintf(msg, sizeof(msg), "%s (%ld/%ld) not configured", params->name, (long)params->vid, (long)params->pid); + rarch_main_msg_queue_push(msg, 0, 60, false); + } return ret; }