From 4b082daa7e05bfbb555007542229dd960cd5c5ca Mon Sep 17 00:00:00 2001 From: radius Date: Sat, 12 Dec 2015 20:56:42 -0500 Subject: [PATCH] fix input labels empty on android --- input/drivers/android_input.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 31392a3acf..43a5909e32 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -832,10 +832,6 @@ static void handle_hotplug(android_input_data_t *android_data, else if (strstr(android_app->current_ime, "com.hexad.bluezime")) strlcpy(name_buf, android_app->current_ime, sizeof(name_buf)); - if (name_buf[0] != '\0') - strlcpy(settings->input.device_names[*port], - name_buf, sizeof(settings->input.device_names[*port])); - if (*port < 0) *port = android_data->pads_connected; @@ -863,6 +859,12 @@ static void handle_hotplug(android_input_data_t *android_data, } } + if (name_buf[0] != '\0') + { + strlcpy(settings->input.device_names[*port], + name_buf, sizeof(settings->input.device_names[*port])); + } + if (!back_mapped && settings->input.back_as_menu_toggle_enable) settings->input.autoconf_binds[*port][RARCH_MENU_TOGGLE].joykey = AKEYCODE_BACK;