From bdc53f0190a61736412ff494e3eb7d243ff48e85 Mon Sep 17 00:00:00 2001
From: rustdesk <info@rustdesk.com>
Date: Mon, 10 Mar 2025 11:09:31 +0900
Subject: [PATCH] improve lock,
 https://github.com/rustdesk/rustdesk/issues/11067

---
 src/client.rs               | 3 ++-
 src/ui_session_interface.rs | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index d2ceffd3c..488e388eb 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -894,7 +894,8 @@ impl ClientClipboardHandler {
                 return;
             }
 
-            if let Some(pi) = ctx.cfg.lc.read().unwrap().peer_info.as_ref() {
+            let pi = ctx.cfg.lc.read().unwrap().peer_info.clone();
+            if let Some(pi) = pi.as_ref() {
                 if let Some(message::Union::MultiClipboards(multi_clipboards)) = &msg.union {
                     if let Some(msg_out) = crate::clipboard::get_msg_if_not_support_multi_clip(
                         &pi.version,
diff --git a/src/ui_session_interface.rs b/src/ui_session_interface.rs
index cf339f18b..f2797876a 100644
--- a/src/ui_session_interface.rs
+++ b/src/ui_session_interface.rs
@@ -1403,9 +1403,10 @@ impl<T: InvokeUiSession> Session<T> {
 
     #[inline]
     fn try_change_init_resolution(&self, display: i32) {
-        if let Some((w, h)) = self.lc.read().unwrap().get_custom_resolution(display) {
-            self.change_resolution(display, w, h);
-        }
+        let Some((w, h)) = self.lc.read().unwrap().get_custom_resolution(display) else {
+            return;
+        };
+        self.change_resolution(display, w, h);
     }
 
     fn do_change_resolution(&self, display: i32, width: i32, height: i32) {