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

fix clipboard update B->A->B

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou
2023-04-10 14:30:38 +08:00
parent fff7feec4c
commit ceb2e6614c
4 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/client/io_loop.rs
View File

@@ -51,8 +51,6 @@ pub struct Remote<T: InvokeUiSession> {
// Stop sending local audio to remote client.
stop_voice_call_sender: Option<std::sync::mpsc::Sender<()>>,
voice_call_request_timestamp: Option<NonZeroI64>,
#[cfg(not(any(target_os = "android", target_os = "ios")))]
old_clipboard: Arc<Mutex<String>>,
read_jobs: Vec<fs::TransferJob>,
write_jobs: Vec<fs::TransferJob>,
remove_jobs: HashMap<i32, RemoveJob>,
@@ -87,8 +85,6 @@ impl<T: InvokeUiSession> Remote<T> {
audio_sender,
receiver,
sender,
#[cfg(not(any(target_os = "android", target_os = "ios")))]
old_clipboard: Default::default(),
read_jobs: Vec::new(),
write_jobs: Vec::new(),
remove_jobs: Default::default(),
@@ -941,10 +937,11 @@ impl<T: InvokeUiSession> Remote<T> {
Client::try_start_clipboard(None);
#[cfg(not(feature = "flutter"))]
#[cfg(not(any(target_os = "android", target_os = "ios")))]
Client::try_start_clipboard(Some((
permission_config.clone(),
sender.clone(),
)));
Client::try_start_clipboard(Some(ClientClipboardContext {
cfg: permission_config.clone(),
old: self.handler.old_clipboard.clone(),
tx: sender.clone(),
}));
#[cfg(not(any(target_os = "android", target_os = "ios")))]
tokio::spawn(async move {
@@ -977,7 +974,7 @@ impl<T: InvokeUiSession> Remote<T> {
Some(message::Union::Clipboard(cb)) => {
if !self.handler.lc.read().unwrap().disable_clipboard.v {
#[cfg(not(any(target_os = "android", target_os = "ios")))]
update_clipboard(cb, Some(&self.old_clipboard));
update_clipboard(cb, Some(&self.handler.old_clipboard));
#[cfg(any(target_os = "android", target_os = "ios"))]
{
let content = if cb.compress {