From d9fba50606ef19065b7cff4bdd40dfdb9a3ca706 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Fri, 2 Aug 2024 15:43:55 +0800 Subject: [PATCH] fix https://github.com/rustdesk/rustdesk-server-pro/issues/334 again --- src/client.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/client.rs b/src/client.rs index d6d8f8546..4156de133 100644 --- a/src/client.rs +++ b/src/client.rs @@ -2111,11 +2111,15 @@ impl LoginConfigHandler { }; let mut display_name = get_buildin_option(config::keys::OPTION_DISPLAY_NAME); if display_name.is_empty() { - display_name = serde_json::from_str::>( - &LocalConfig::get_option("user_info"), - ) - .map(|mut x| x.remove("name").unwrap_or_default()) - .unwrap_or_default(); + display_name = + serde_json::from_str::(&LocalConfig::get_option("user_info")) + .map(|x| { + x.get("name") + .map(|x| x.as_str().unwrap_or_default()) + .unwrap_or_default() + .to_owned() + }) + .unwrap_or_default(); } if display_name.is_empty() { display_name = crate::username();