Merge branch 'rustdesk:master' into master

zhangbo8418 · Mar 10, 2025 · 451ad20 · 451ad20
2 parents 2cfb67f + df4a101
commit 451ad20
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/libs/clipboard/src/platform/mod.rs b/libs/clipboard/src/platform/mod.rs
@@ -15,7 +15,7 @@ pub fn create_cliprdr_context(
 #[cfg(feature = "unix-file-copy-paste")]
 pub mod unix;
 
-#[cfg(target_os = "macos")]
+#[cfg(all(feature = "unix-file-copy-paste", target_os = "macos"))]
 pub fn create_cliprdr_context(
     _enable_files: bool,
     _enable_others: bool,

diff --git 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
@@ -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) {