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

fix merge problem of last commit

Browse Source
This commit is contained in:
rustdesk 2024-06-10 19:53:02 +08:00
parent dd90096e13
commit f8041a3de5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
flutter/lib/common.dart
View File

@ -1430,7 +1430,7 @@ bool option2bool(String option, String value) {
if (option.startsWith("enable-")) { if (option.startsWith("enable-")) {
res = value != "N"; res = value != "N";
} else if (option.startsWith("allow-") || } else if (option.startsWith("allow-") ||
option == "stop-service" || option == kOptionStopService ||
option == kOptionDirectServer || option == kOptionDirectServer ||
option == kOptionForceAlwaysRelay) { option == kOptionForceAlwaysRelay) {
res = value == "Y"; res = value == "Y";
@ -1446,7 +1446,7 @@ String bool2option(String option, bool b) {
if (option.startsWith('enable-')) { if (option.startsWith('enable-')) {
res = b ? defaultOptionYes : 'N'; res = b ? defaultOptionYes : 'N';
} else if (option.startsWith('allow-') || } else if (option.startsWith('allow-') ||
option == "stop-service" || option == kOptionStopService ||
option == kOptionDirectServer || option == kOptionDirectServer ||
option == kOptionForceAlwaysRelay) { option == kOptionForceAlwaysRelay) {
res = b ? 'Y' : defaultOptionNo; res = b ? 'Y' : defaultOptionNo;
@ -1483,9 +1483,9 @@ bool mainGetPeerBoolOptionSync(String id, String key) {
return option2bool(key, bind.mainGetPeerOptionSync(id: id, key: key)); return option2bool(key, bind.mainGetPeerOptionSync(id: id, key: key));
} }
mainSetPeerBoolOptionSync(String id, String key, bool v) { // Don't use `option2bool()` and `bool2option()` to convert the session option.
bind.mainSetPeerOptionSync(id: id, key: key, value: bool2option(key, v)); // Use `sessionGetToggleOption()` and `sessionToggleOption()` instead.
} // Because all session options use `Y` and `<Empty>` as values.
Future<bool> matchPeer(String searchText, Peer peer) async { Future<bool> matchPeer(String searchText, Peer peer) async {
if (searchText.isEmpty) { if (searchText.isEmpty) {
@ -2670,7 +2670,7 @@ Future<void> start_service(bool is_start) async {
!isMacOS || !isMacOS ||
await callMainCheckSuperUserPermission(); await callMainCheckSuperUserPermission();
if (checked) { if (checked) {
bind.mainSetOption(key: "stop-service", value: is_start ? "" : "Y"); mainSetBoolOption(kOptionStopService, !is_start);
} }
} }