diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart index f7035ae1b..a78af2a94 100644 --- a/flutter/lib/common.dart +++ b/flutter/lib/common.dart @@ -600,16 +600,12 @@ class OverlayDialogManager { int _tagCount = 0; OverlayEntry? _mobileActionsOverlayEntry; - bool _stop = false; void setOverlayState(OverlayKeyState overlayKeyState) { _overlayKeyState = overlayKeyState; } - void dismissAll({bool? stop}) { - if (stop != null) { - _stop = stop; - } + void dismissAll() { _dialogs.forEach((key, value) { value.complete(null); BackButtonInterceptor.removeByName(key); @@ -629,7 +625,6 @@ class OverlayDialogManager { String? tag, bool useAnimation = true, bool forceGlobal = false}) { - if (_stop) return Future(() => null); final overlayState = forceGlobal ? globalKey.currentState?.overlay : _overlayKeyState.state; diff --git a/flutter/lib/desktop/pages/file_manager_page.dart b/flutter/lib/desktop/pages/file_manager_page.dart index 401e8f0c1..eae3f1d69 100644 --- a/flutter/lib/desktop/pages/file_manager_page.dart +++ b/flutter/lib/desktop/pages/file_manager_page.dart @@ -97,7 +97,7 @@ class _FileManagerPageState extends State void dispose() { model.close().whenComplete(() { _ffi.close(); - _ffi.dialogManager.dismissAll(stop: true); + _ffi.dialogManager.dismissAll(); if (!Platform.isLinux) { Wakelock.disable(); } diff --git a/flutter/lib/desktop/pages/port_forward_page.dart b/flutter/lib/desktop/pages/port_forward_page.dart index cca6a2edb..3a16ffbe1 100644 --- a/flutter/lib/desktop/pages/port_forward_page.dart +++ b/flutter/lib/desktop/pages/port_forward_page.dart @@ -70,7 +70,7 @@ class _PortForwardPageState extends State @override void dispose() { _ffi.close(); - _ffi.dialogManager.dismissAll(stop: true); + _ffi.dialogManager.dismissAll(); if (!Platform.isLinux) { Wakelock.disable(); } diff --git a/flutter/lib/desktop/pages/remote_page.dart b/flutter/lib/desktop/pages/remote_page.dart index 159d630f3..8259b53d0 100644 --- a/flutter/lib/desktop/pages/remote_page.dart +++ b/flutter/lib/desktop/pages/remote_page.dart @@ -220,7 +220,7 @@ class _RemotePageState extends State _rawKeyFocusNode.dispose(); _ffi.close(); _timer?.cancel(); - _ffi.dialogManager.dismissAll(stop: true); + _ffi.dialogManager.dismissAll(); SystemChrome.setEnabledSystemUIMode(SystemUiMode.manual, overlays: SystemUiOverlay.values); if (!Platform.isLinux) {