From 5eba940aa24f7e7ca2e27c0d2fce697fa712d170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9E=AB=E9=9B=A8?= <737345039@qq.com> Date: Sat, 20 May 2023 23:02:20 +0800 Subject: [PATCH] chore: improve ConfirmExit() --- src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index cef45ee4c7..8b399d4761 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -171,18 +171,20 @@ namespace MaaWpfGui.ViewModels.UI return true; } + if (!Instances.RecognizerViewModel.GachaDone) + { + // no need to confirm if Gacha running + return true; + } + var window = Instances.MainWindowManager.GetWindowIfVisible(); var result = MessageBoxHelper.ShowNative(window, LocalizationHelper.GetString("ConfirmExitText"), LocalizationHelper.GetString("ConfirmExitTitle"), "MAA", MessageBoxButton.YesNo, MessageBoxImage.Information, MessageBoxResult.No); return result == MessageBoxResult.Yes; } -#pragma warning disable CS0672 // Member overrides obsolete member - - // WHY OBSOLETED? - protected override bool CanClose() -#pragma warning restore CS0672 // Member overrides obsolete member + public override Task CanCloseAsync() { - return ConfirmExit(); + return Task.FromResult(this.ConfirmExit()); } private void InitTimer()