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

Merge pull request #5266 from dignow/refact/separate_remote_window

Browse Source 
fix, reuse window type
This commit is contained in:
RustDesk 2023-08-06 16:55:58 +08:00 committed by GitHub
commit 9dd7b4d5d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,22 +90,21 @@ class RustDeskMultiWindowManager {
) async { ) async {
if (separateWindow) { if (separateWindow) {
if (kCloseMultiWindowByHide && _inactiveWindows.isNotEmpty) { if (kCloseMultiWindowByHide && _inactiveWindows.isNotEmpty) {
final windowId = _inactiveWindows.first; for (final windowId in windows) {
final invokeRes = if (_inactiveWindows.contains(windowId)) {
await DesktopMultiWindow.invokeMethod(windowId, methodName, msg); await DesktopMultiWindow.invokeMethod(
final windowController = WindowController.fromWindowId(windowId); windowId, methodName, msg);
windowController.show(); WindowController.fromWindowId(windowId).show();
registerActiveWindow(windowController.windowId); registerActiveWindow(windowId);
windows.add(windowController.windowId); }
return invokeRes; }
} else {
await newSessionWindow(type, remoteId, msg, windows);
} }
await newSessionWindow(type, remoteId, msg, windows);
} else { } else {
if (windows.isEmpty) { if (windows.isEmpty) {
await newSessionWindow(type, remoteId, msg, windows); await newSessionWindow(type, remoteId, msg, windows);
} else { } else {
return call(type, methodName, msg); call(type, methodName, msg);
} }
} }
} }