From 638db98e7d867991ca953133df67e36a7276c221 Mon Sep 17 00:00:00 2001 From: Radius Date: Thu, 13 Aug 2015 03:14:53 +0100 Subject: [PATCH] fix the back as menu toggle option, autoconf was returning false even when a controller was succesfully configured... --- input/drivers/android_input.c | 3 +-- input/input_autodetect.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 12b8cc1071..46d6fb63d0 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -729,7 +729,7 @@ static void handle_hotplug(android_input_t *android, if (settings->input.autodetect_enable) { - unsigned autoconfigured = false; + bool autoconfigured = false; autoconfig_params_t params = {{0}}; RARCH_LOG("Port %d: %s VID/PID: %d/%d\n", *port, name_buf, params.vid, params.pid); @@ -743,7 +743,6 @@ static void handle_hotplug(android_input_t *android, strlcpy(params.driver, android_joypad.ident, sizeof(params.driver)); autoconfigured = input_config_autoconfigure_joypad(¶ms); - if (autoconfigured) { if (settings->input.autoconf_binds[*port][RARCH_MENU_TOGGLE].joykey != 0) diff --git a/input/input_autodetect.c b/input/input_autodetect.c index 243a3ac639..99d048c431 100644 --- a/input/input_autodetect.c +++ b/input/input_autodetect.c @@ -227,6 +227,7 @@ static bool input_autoconfigure_joypad_from_conf_dir( conf = config_file_new(list->elems[index].data); input_autoconfigure_joypad_add(conf, params); config_file_free(conf); + ret = 1; } else {