From ec772a3edd630a742b1c2b1388b29cbe99230de4 Mon Sep 17 00:00:00 2001 From: zoltanvb Date: Sun, 2 Jun 2024 12:56:04 +0200 Subject: [PATCH] Finetune empty value handling and device match. --- menu/cbs/menu_cbs_ok.c | 5 ++++- menu/menu_setting.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 3a68b72fc9f3..8f4006d68b6f 100644 --- 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 index 51ad76ad0eaa..90b78dd5b74c 100644 --- 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; }