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

Merge remote-tracking branch 'github/master' into sigma

Browse Source
This commit is contained in:
sjpark
2023-02-28 16:00:31 +09:00
parent e26707e552 6a97608b98
commit 19d1214a05
87 changed files with 3236 additions and 584 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ui/index.tis
View File

@@ -62,12 +62,15 @@ function createNewConnect(id, type) {
id = id.replace(/\s/g, "");
app.remote_id.value = formatId(id);
if (!id) return;
var old_id = id;
id = handler.handle_relay_id(id);
var force_relay = old_id != id;
if (id == my_id) {
msgbox("custom-error", "Error", "You cannot connect to your own computer");
return;
}
handler.set_remote_id(id);
handler.new_remote(id, type);
handler.new_remote(id, type, force_relay);
}
class ShareRdp: Reactor.Component {

5
src/ui/remote.rs
View File

@@ -277,6 +277,8 @@ impl InvokeUiSession for SciterHandler {
fn switch_back(&self, _id: &str) {}
fn portable_service_running(&self, _running: bool) {}
fn on_voice_call_started(&self) {
self.call("onVoiceCallStart", &make_args!());
}
@@ -460,6 +462,7 @@ impl sciter::EventHandler for SciterSession {
impl SciterSession {
pub fn new(cmd: String, id: String, password: String, args: Vec<String>) -> Self {
let force_relay = args.contains(&"--relay".to_string());
let session: Session<SciterHandler> = Session {
id: id.clone(),
password: password.clone(),
@@ -484,7 +487,7 @@ impl SciterSession {
.lc
.write()
.unwrap()
.initialize(id, conn_type, None, false);
.initialize(id, conn_type, None, force_relay);
Self(session)
}