mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-12-12 18:29:10 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #3772 from Kingtous/master

Browse Source 
fix: shortcut not working due to range error
This commit is contained in:
RustDesk 2023-03-25 11:20:57 +08:00 committed by GitHub
commit ab4c6e24f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
flutter/lib/common.dart
View File

@ -1522,14 +1522,14 @@ bool checkArguments() {
return false; return false;
} }
String? id = String? id =
kBootArgs.length < connectIndex + 1 ? null : kBootArgs[connectIndex + 1]; kBootArgs.length <= connectIndex + 1 ? null : kBootArgs[connectIndex + 1];
String? password = String? password =
kBootArgs.length < connectIndex + 2 ? null : kBootArgs[connectIndex + 2]; kBootArgs.length <= connectIndex + 2 ? null : kBootArgs[connectIndex + 2];
if (password != null && password.startsWith("--")) { if (password != null && password.startsWith("--")) {
password = null; password = null;
} }
final switchUuidIndex = kBootArgs.indexOf("--switch_uuid"); final switchUuidIndex = kBootArgs.indexOf("--switch_uuid");
String? switchUuid = kBootArgs.length < switchUuidIndex + 1 String? switchUuid = kBootArgs.length <= switchUuidIndex + 1
? null ? null
: kBootArgs[switchUuidIndex + 1]; : kBootArgs[switchUuidIndex + 1];
if (id != null) { if (id != null) {

5
flutter/lib/main.dart
View File

@ -134,10 +134,9 @@ void runMainApp(bool startService) async {
await restoreWindowPosition(WindowType.Main); await restoreWindowPosition(WindowType.Main);
// Check the startup argument, if we successfully handle the argument, we keep the main window hidden. // Check the startup argument, if we successfully handle the argument, we keep the main window hidden.
final handledByUniLinks = await initUniLinks(); final handledByUniLinks = await initUniLinks();
final handledByCli = checkArguments();
debugPrint( debugPrint(
"handled by uni links: $handledByUniLinks, handled by cli: $handledByCli"); "handled by uni links: $handledByUniLinks");
if (handledByUniLinks || handledByCli) { if (handledByUniLinks || checkArguments()) {
windowManager.hide(); windowManager.hide();
} else { } else {
windowManager.show(); windowManager.show();