weyne/rustdesk
1
0
Fork 0
mirror of https://github.com/weyne85/rustdesk.git synced 2025-10-29 17:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

win, clipboard, debug

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-06-20 00:05:23 +08:00
parent 773bb1bad7
commit 53a1aeac61
5 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/ui_cm_interface.rs
View File

@@ -72,6 +72,8 @@ struct IpcTaskRunner<T: InvokeUiCM> {
conn_id: i32,
#[cfg(windows)]
file_transfer_enabled: bool,
#[cfg(windows)]
file_transfer_enabled_peer: bool,
}
lazy_static::lazy_static! {
@@ -401,11 +403,13 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
Data::ClipboardFile(_clip) => {
#[cfg(windows)]
{
let is_stopping_allowed = _clip.is_stopping_allowed();
let is_stopping_allowed = _clip.is_stopping_allowed_from_peer();
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);
log::debug!(
"Process clipboard message from client peer, stop: {}, is_stopping_allowed: {}, is_clipboard_enabled: {}, file_transfer_enabled: {}",
stop, is_stopping_allowed, is_clipboard_enabled, file_transfer_enabled);
if stop {
ContextSend::set_is_stopped();
} else {
@@ -416,6 +420,12 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
}
}
}
Data::ClipboardFileEnabled(_enabled) => {
#[cfg(windows)]
{
self.file_transfer_enabled_peer =_enabled;
}
}
Data::Theme(dark) => {
self.cm.change_theme(dark);
}
@@ -461,8 +471,11 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
let is_stopping_allowed = _clip.is_stopping_allowed();
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);
let file_transfer_enabled_peer = self.file_transfer_enabled_peer;
let stop = is_stopping_allowed && !(is_clipboard_enabled && file_transfer_enabled && file_transfer_enabled_peer);
log::debug!(
"Process clipboard message from cm, stop: {}, is_stopping_allowed: {}, is_clipboard_enabled: {}, file_transfer_enabled: {}, file_transfer_enabled_peer: {}",
stop, is_stopping_allowed, is_clipboard_enabled, file_transfer_enabled, file_transfer_enabled_peer);
if stop {
ContextSend::set_is_stopped();
} else {
@@ -492,6 +505,8 @@ impl<T: InvokeUiCM> IpcTaskRunner<T> {
conn_id: 0,
#[cfg(windows)]
file_transfer_enabled: false,
#[cfg(windows)]
file_transfer_enabled_peer: false,
};
while task_runner.running {