From e0e21b3386ec68c3a54295cc7a8fcc731e9e7b18 Mon Sep 17 00:00:00 2001
From: sonninnos <45124675+sonninnos@users.noreply.github.com>
Date: Fri, 30 Dec 2022 17:53:47 +0200
Subject: [PATCH] Fix system info autoconf device list (#14783)

---
 intl/msg_hash_us.h           | 4 ++--
 menu/cbs/menu_cbs_sublabel.c | 2 +-
 menu/menu_displaylist.c      | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 4939d48fef..452f5bdf47 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -11399,11 +11399,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PORT_DEVICE_NAME,
-   "Port %d device name: %s (#%d)"
+   "Port %d Device Name: %s (#%d)"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PORT_DEVICE_INFO,
-   "Device display name: %s\nDevice config name: %s\nDevice VID/PID: %d/%d"
+   "Device Display Name: %s\nDevice Config Name: %s\nDevice VID/PID: %d/%d"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEAT_SETTINGS,
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 7277811eaa..dc19855469 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -1239,7 +1239,7 @@ static int action_bind_sublabel_systeminfo_controller_entry(
       {
             snprintf(tmp, sizeof(tmp),
                val_port_dev_name,
-               controller,
+               controller + 1,
                input_config_get_device_name(controller),
                input_config_get_device_name_index(controller));
 
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 5b90acfeb5..b9af1ad426 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1788,7 +1788,7 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
       {
          snprintf(tmp, sizeof(tmp),
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PORT_DEVICE_NAME),
-            controller+1,
+            controller + 1,
             input_config_get_device_name(controller),
             input_config_get_device_name_index(controller));
 
@@ -1800,7 +1800,7 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
 #ifdef HAVE_RGUI
          if (string_is_equal(menu_driver, "rgui"))
          {
-            strlcpy(tmp, "- Device display name: ", sizeof(tmp));
+            strlcpy(tmp, "- Device Display Name: ", sizeof(tmp));
             strlcat(tmp,
                input_config_get_device_display_name(controller) ?
                input_config_get_device_display_name(controller) :
@@ -1810,7 +1810,7 @@ static unsigned menu_displaylist_parse_system_info(file_list_t *list)
                MENU_ENUM_LABEL_SYSTEM_INFO_CONTROLLER_ENTRY,
                MENU_SETTINGS_CORE_INFO_NONE, 0, 0, NULL))
                count++;
-            strlcpy(tmp, "- Device config name: ", sizeof(tmp));
+            strlcpy(tmp, "- Device Config Name: ", sizeof(tmp));
             strlcat(tmp,
                input_config_get_device_config_name(controller) ?
                input_config_get_device_config_name(controller)  :