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: keep clipboard alive

Browse Source 
Signed-off-by: ClSlaid <cailue@bupt.edu.cn>
This commit is contained in:
ClSlaid
2023-10-28 15:31:12 +08:00
parent 075a877284
commit 9976fc9723
4 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libs/clipboard/src/platform/linux/x11.rs
View File

@@ -67,9 +67,12 @@ impl X11Clipboard {
// NOTE:
// # why not use `load_wait`
// load_wait is likely to wait forever, which is not what we want
get_clip()?
.load(clip, target, prop, X11_CLIPBOARD_TIMEOUT)
.map_err(|_| CliprdrError::ConversionFailure)
let res = get_clip()?.load(clip, target, prop, X11_CLIPBOARD_TIMEOUT);
match res {
Ok(res) => Ok(res),
Err(x11_clipboard::error::Error::UnexpectedType(_)) => Ok(vec![]),
Err(_) => Err(CliprdrError::ClipboardInternalError),
}
}
fn store_batch(&self, batch: Vec<(Atom, Vec<u8>)>) -> Result<(), CliprdrError> {
@@ -85,7 +88,6 @@ impl X11Clipboard {
return Ok(None);
}
let v = self.load(self.text_uri_list)?;
// loading 'text/uri-list' should be enough?
let p = parse_plain_uri_list(v)?;
Ok(Some(p))
}