diff --git a/libs/clipboard/src/context_send.rs b/libs/clipboard/src/context_send.rs index 2c9780249..e847e3a72 100644 --- a/libs/clipboard/src/context_send.rs +++ b/libs/clipboard/src/context_send.rs @@ -7,24 +7,24 @@ lazy_static::lazy_static! { } pub struct ContextSend { - server_enabled: bool, + cm_enabled: bool, addr: u64, } impl ContextSend { fn new() -> Self { Self { - server_enabled: false, + cm_enabled: false, addr: 0, } } #[inline] - pub fn is_server_enabled() -> bool { - CONTEXT_SEND.lock().unwrap().server_enabled + pub fn is_cm_enabled() -> bool { + CONTEXT_SEND.lock().unwrap().cm_enabled } - pub fn enable(enabled: bool, is_server_side: bool, is_server_process: bool) { + pub fn enable(enabled: bool, is_cm_side: bool, is_server_process: bool) { let mut lock = CONTEXT_SEND.lock().unwrap(); if enabled { if lock.addr == 0 { @@ -41,8 +41,8 @@ impl ContextSend { } } } - if is_server_side { - lock.server_enabled = true; + if is_cm_side { + lock.cm_enabled = true; } } else { if lock.addr != 0 { @@ -53,7 +53,7 @@ impl ContextSend { log::info!("clipboard context for file transfer destroyed."); lock.addr = 0; } - lock.server_enabled = false; + lock.cm_enabled = false; } } } diff --git a/src/server/connection.rs b/src/server/connection.rs index afcac136f..968c2ed80 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -439,10 +439,9 @@ impl Connection { #[cfg(windows)] ipc::Data::ClipboardFile(clip) => { let is_stopping_allowed = clip.is_stopping_allowed(); - let is_clipboard_enabled = clipboard::ContextSend::is_server_enabled(); let file_transfer_enabled = conn.file_transfer_enabled(); - let stop = is_stopping_allowed && !(is_clipboard_enabled && file_transfer_enabled); - log::debug!("Process clipboard message from cm, stop: {}, is_stopping_allowed: {}, is_clipboard_enabled: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, is_clipboard_enabled, file_transfer_enabled); + let stop = is_stopping_allowed && !file_transfer_enabled; + log::debug!("Process clipboard message from cm, stop: {}, is_stopping_allowed: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, file_transfer_enabled); if !stop { allow_err!(conn.stream.send(&clip_2_msg(clip)).await); } diff --git a/src/ui_cm_interface.rs b/src/ui_cm_interface.rs index dc81b905e..4c9d54153 100644 --- a/src/ui_cm_interface.rs +++ b/src/ui_cm_interface.rs @@ -336,7 +336,7 @@ impl IpcTaskRunner { #[cfg(windows)] { - if ContextSend::is_server_enabled() { + if ContextSend::is_cm_enabled() { allow_err!( self.stream .send(&Data::ClipboardFile(clipboard::ClipboardFile::MonitorReady)) @@ -402,7 +402,7 @@ impl IpcTaskRunner { #[cfg(windows)] { let is_stopping_allowed = _clip.is_stopping_allowed(); - let is_clipboard_enabled = ContextSend::is_server_enabled(); + let is_clipboard_enabled = ContextSend::is_cm_enabled(); let file_transfer_enabled = self.file_transfer_enabled; let stop = !is_stopping_allowed && !(is_clipboard_enabled && file_transfer_enabled); log::debug!("Process clipboard message from peer, stop: {}, is_stopping_allowed: {}, is_clipboard_enabled: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, is_clipboard_enabled, file_transfer_enabled); @@ -457,7 +457,7 @@ impl IpcTaskRunner { #[cfg(windows)] { let is_stopping_allowed = _clip.is_stopping_allowed(); - let is_clipboard_enabled = ContextSend::is_server_enabled(); + let is_clipboard_enabled = ContextSend::is_cm_enabled(); let file_transfer_enabled = self.file_transfer_enabled; let stop = is_stopping_allowed && !(is_clipboard_enabled && file_transfer_enabled); log::debug!("Process clipboard message from cm, stop: {}, is_stopping_allowed: {}, is_clipboard_enabled: {}, file_transfer_enabled: {}", stop, is_stopping_allowed, is_clipboard_enabled, file_transfer_enabled);