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

remove useless empty --switch_uuid

Browse Source 
Signed-off-by: 21pages <pages21@163.com>
This commit is contained in:
21pages 2023-02-01 19:49:41 +08:00
parent 76adc8de20
commit 8d60bcd51a
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
flutter/lib/utils/multi_window_manager.dart
View File

@ -43,11 +43,14 @@ class RustDeskMultiWindowManager {
Future<dynamic> newRemoteDesktop(String remoteId, Future<dynamic> newRemoteDesktop(String remoteId,
{String? switch_uuid}) async { {String? switch_uuid}) async {
final msg = jsonEncode({ var params = {
"type": WindowType.RemoteDesktop.index, "type": WindowType.RemoteDesktop.index,
"id": remoteId, "id": remoteId,
"switch_uuid": switch_uuid ?? "" };
}); if (switch_uuid != null) {
params['switch_uuid'] = switch_uuid;
}
final msg = jsonEncode(params);
try { try {
final ids = await DesktopMultiWindow.getAllSubWindowIds(); final ids = await DesktopMultiWindow.getAllSubWindowIds();

8
src/core_main.rs
View File

@ -304,9 +304,13 @@ fn core_main_invoke_new_connection(mut args: std::env::Args) -> Option<Vec<Strin
switch_uuid = args.next(); switch_uuid = args.next();
} }
} }
let mut param_array = vec![];
if switch_uuid.is_some() {
let switch_uuid = switch_uuid.map_or("".to_string(), |p| format!("switch_uuid={}", p)); let switch_uuid = switch_uuid.map_or("".to_string(), |p| format!("switch_uuid={}", p));
let params = vec![switch_uuid].join("&"); param_array.push(switch_uuid);
}
let params = param_array.join("&");
let params_flag = if params.is_empty() { "" } else { "?" }; let params_flag = if params.is_empty() { "" } else { "?" };
#[allow(unused)] #[allow(unused)]
let uni_links = format!( let uni_links = format!(