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

stupid workaround for https://sciter.com/forums/topic/crash-on-latest-tis-mac-sdk-sometimes/

Browse Source
This commit is contained in:
rustdesk
2022-02-06 18:19:06 +08:00
parent 3ec69b6d97
commit 809c220eaf
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/cm.rs
View File

@@ -61,7 +61,7 @@ impl ConnectionManager {
fn call(&self, func: &str, args: &[Value]) {
let r = self.read().unwrap();
if let Some(ref e) = r.root {
allow_err!(e.call_method(func, args));
allow_err!(e.call_method(func, &super::value_crash_workaround(args)[..]));
}
}

12
src/ui/remote.rs
View File

@@ -1066,7 +1066,7 @@ impl Handler {
fn call(&self, func: &str, args: &[Value]) {
let r = self.read().unwrap();
if let Some(ref e) = r.element {
allow_err!(e.call_method(func, args));
allow_err!(e.call_method(func, &super::value_crash_workaround(args)[..]));
}
}
@@ -1605,7 +1605,7 @@ impl Remote {
if !(self.handler.is_file_transfer()
|| self.handler.is_port_forward()
|| !unsafe { SERVER_CLIPBOARD_ENABLED }
|| !unsafe { SERVER_KEYBOARD_ENABLED }
|| !unsafe { SERVER_KEYBOARD_ENABLED }
|| self.handler.lc.read().unwrap().disable_clipboard)
{
let txt = self.old_clipboard.lock().unwrap().clone();
@@ -1681,12 +1681,16 @@ impl Remote {
log::info!("Change permission {:?} -> {}", p.permission, p.enabled);
match p.permission.enum_value_or_default() {
Permission::Keyboard => {
unsafe { SERVER_KEYBOARD_ENABLED = p.enabled; }
unsafe {
SERVER_KEYBOARD_ENABLED = p.enabled;
}
self.handler
.call("setPermission", &make_args!("keyboard", p.enabled));
}
Permission::Clipboard => {
unsafe { SERVER_CLIPBOARD_ENABLED = p.enabled; }
unsafe {
SERVER_CLIPBOARD_ENABLED = p.enabled;
}
self.handler
.call("setPermission", &make_args!("clipboard", p.enabled));
}