From acf3b22fd3528e4c1beaff4d8544aee755f1c6b2 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 25 Apr 2017 16:36:31 +0200 Subject: [PATCH] Go through wrapper functions --- menu/menu_displaylist.c | 2 +- tasks/task_autodetect.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index cd4c2b5ca1..060e21e466 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -648,7 +648,7 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info) if (input_is_autoconfigured(controller)) { snprintf(tmp, sizeof(tmp), "Port #%d device name: %s (#%d)", - controller, settings->input.device_names[controller], + controller, input_config_get_device_name(controller), settings->input.device_name_index[controller]); menu_entries_append_enum(info->list, tmp, "", MENU_ENUM_LABEL_SYSTEM_INFO_ENTRY, diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c index 22970359d6..fe0ed2b279 100644 --- a/tasks/task_autodetect.c +++ b/tasks/task_autodetect.c @@ -73,7 +73,7 @@ static void input_autoconfigure_joypad_reindex_devices(autoconfig_params_t *para for(j = 0; j < params->max_users; j++) { - if(string_is_equal(tmp, settings->input.device_names[j]) + if(string_is_equal(tmp, input_config_get_device_name(j)) && settings->input.device_name_index[i] == 0) { configuration_set_uint(settings, settings->input.device_name_index[j], k);