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

Merge pull request #6051 from fufesou/fix/connect_the_same_peer

Browse Source 
fix, connect the same peer
This commit is contained in:
RustDesk 2023-10-16 10:54:46 +08:00 committed by GitHub
commit a68c7bf019
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/consts.dart
View File

@ -4,8 +4,6 @@ import 'package:flutter/material.dart';
import 'package:flutter_hbb/common.dart'; import 'package:flutter_hbb/common.dart';
import 'package:flutter_hbb/models/state_model.dart'; import 'package:flutter_hbb/models/state_model.dart';
const bool kOpenSamePeerInNewWindow = true;
const double kDesktopRemoteTabBarHeight = 28.0; const double kDesktopRemoteTabBarHeight = 28.0;
const int kInvalidWindowId = -1; const int kInvalidWindowId = -1;
const int kMainWindowId = 0; const int kMainWindowId = 0;

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

@ -2,7 +2,6 @@ import 'dart:convert';
import 'dart:io'; import 'dart:io';
import 'package:desktop_multi_window/desktop_multi_window.dart'; import 'package:desktop_multi_window/desktop_multi_window.dart';
import 'package:flutter_hbb/models/platform_model.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
@ -187,21 +186,11 @@ class RustDeskMultiWindowManager {
bool openInTabs = type != WindowType.RemoteDesktop || bool openInTabs = type != WindowType.RemoteDesktop ||
mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs); mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs);
if (kOpenSamePeerInNewWindow) { if (windows.length > 1 || !openInTabs) {
// Open in new window if the peer is already connected. for (final windowId in windows) {
// No need to care about the previous session type. if (await DesktopMultiWindow.invokeMethod(
if (type == WindowType.RemoteDesktop && windowId, kWindowEventActiveSession, remoteId)) {
await bind.sessionGetFlutterOptionByPeerId(id: remoteId, k: '') != return MultiWindowCallResult(windowId, null);
null) {
openInTabs = false;
}
} else {
if (windows.length > 1 || !openInTabs) {
for (final windowId in windows) {
if (await DesktopMultiWindow.invokeMethod(
windowId, kWindowEventActiveSession, remoteId)) {
return MultiWindowCallResult(windowId, null);
}
} }
} }
} }