Finetune empty value handling and device match.

zoltanvb · Jun 2, 2024 · ec772a3 · ec772a3
1 parent ac70e1d
commit ec772a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
@@ -7358,7 +7358,10 @@ static int action_ok_push_dropdown_item_input_select_reserved_device(const char
        int i;
        for (i = 0; i < MAX_INPUT_DEVICES; i++)
        {
-          const char* device_name = input_config_get_device_name(i);
+          const char* device_name = input_config_get_device_display_name(i)
+                                    ? input_config_get_device_display_name(i)
+                                    : input_config_get_device_name(i);
+
           if (string_is_equal(device_name, reserved_device_name))
           {
              uint16_t vendor_id = input_config_get_device_vid(i);

diff --git a/menu/menu_setting.c b/menu/menu_setting.c
@@ -7730,7 +7730,7 @@ static int setting_action_start_input_device_reserved_device_name(rarch_setting_
 
    configuration_set_string(settings,
          settings->arrays.input_reserved_devices[setting->index_offset],
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NONE));
+         "");
    return 0;
 }