konevsa/rustdesk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1713 from Kingtous/master

Browse Source 
fix: avoid corrupt with --connect in sciter
This commit is contained in:
RustDesk 2022-10-13 10:27:21 +08:00 committed by GitHub
commit aba41f98b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core_main.rs
View File

@ -13,28 +13,34 @@ pub fn core_main() -> Option<Vec<String>> {
let mut is_setup = false; let mut is_setup = false;
let mut _is_elevate = false; let mut _is_elevate = false;
let mut _is_run_as_system = false; let mut _is_run_as_system = false;
let mut _is_connect = false; let mut _is_flutter_connect = false;
for arg in std::env::args() { for arg in std::env::args() {
// to-do: how to pass to flutter? // to-do: how to pass to flutter?
if i == 0 && crate::common::is_setup(&arg) { if i == 0 && crate::common::is_setup(&arg) {
is_setup = true; is_setup = true;
} else if i > 0 { } else if i > 0 {
#[cfg(feature = "flutter")]
if arg == "--connect" {
_is_flutter_connect = true;
}
if arg == "--elevate" { if arg == "--elevate" {
_is_elevate = true; _is_elevate = true;
} else if arg == "--run-as-system" { } else if arg == "--run-as-system" {
_is_run_as_system = true; _is_run_as_system = true;
} else if arg == "--connect" {
_is_connect = true;
} else { } else {
args.push(arg); args.push(arg);
} }
} }
i += 1; i += 1;
} }
if _is_connect { if args.contains(&"--install".to_string()) {
is_setup = true;
}
#[cfg(feature = "flutter")]
if _is_flutter_connect {
return core_main_invoke_new_connection(std::env::args()); return core_main_invoke_new_connection(std::env::args());
} }
if args.contains(&"--install".to_string()) { if args.contains(&"--install".to_string()) {
is_setup = true; is_setup = true;
} }
if is_setup { if is_setup {
@ -220,13 +226,13 @@ fn import_config(path: &str) {
/// invoke a new connection /// invoke a new connection
/// ///
/// [Note] /// [Note]
/// this is for invoke new connection from dbus /// this is for invoke new connection from dbus.
#[cfg(feature = "flutter")]
fn core_main_invoke_new_connection(mut args: Args) -> Option<Vec<String>> { fn core_main_invoke_new_connection(mut args: Args) -> Option<Vec<String>> {
args args.position(|element| {
.position(|element| { return element == "--connect";
return element == "--connect"; })
}) .unwrap();
.unwrap();
let peer_id = args.next().unwrap_or("".to_string()); let peer_id = args.next().unwrap_or("".to_string());
if peer_id.is_empty() { if peer_id.is_empty() {
eprintln!("please provide a valid peer id"); eprintln!("please provide a valid peer id");