Merge pull request #2558 from fr500/master

fix input labels empty on android
This commit is contained in:
Twinaphex 2015-12-13 03:28:41 +01:00
commit 519275e629

View File

@ -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;