diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index 74d8885582..8b3ca8050d 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -1176,8 +1176,6 @@ public class AsstProxy case AsstMsg.AllTasksCompleted: bool isMainTaskQueueAllCompleted = false; - bool startByLinkStart = Instances.TaskQueueViewModel.StartByLinkStart; - Instances.TaskQueueViewModel.StartByLinkStart = false; var taskList = details["finished_tasks"]?.ToObject(); if (taskList?.Length > 0) { @@ -1289,15 +1287,12 @@ public class AsstProxy } // Instances.TaskQueueViewModel.CheckAndShutdown(); + _ = Instances.TaskQueueViewModel.CheckAfterCompleted(); + if (Instances.OverlayViewModel.IsCreated) { AchievementTrackerHelper.Instance.Unlock(AchievementIds.LogSupervisor); } - - if (startByLinkStart) - { - _ = Instances.TaskQueueViewModel.CheckAfterCompleted(); - } } else if (isCopilotTaskChain) { diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index 05d93776f9..1778253f40 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -29,6 +29,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Media.Imaging; using JetBrains.Annotations; +using MaaWpfGui.Configuration; using MaaWpfGui.Configuration.Factory; using MaaWpfGui.Configuration.Single.MaaTask; using MaaWpfGui.Constants; @@ -211,8 +212,6 @@ public class TaskQueueViewModel : Screen }); } - #region Overlay - public static void ChooseOverlayTarget() { try @@ -276,8 +275,6 @@ public class TaskQueueViewModel : Screen } } - #endregion Overlay - /// /// Gets or private sets the view models of log items. /// @@ -438,8 +435,6 @@ public class TaskQueueViewModel : Screen #region ActionAfterTasks - public bool StartByLinkStart { get; set; } - private bool _enableAfterActionSetting; /// @@ -1774,7 +1769,6 @@ public class TaskQueueViewModel : Screen /// Task public async Task LinkStart() { - StartByLinkStart = true; using var log = new LogScope(_logger); await TaskQueueSerializingLock.WaitAsync(); await LinkStartWithTasks(ConfigFactory.CurrentConfig.TaskQueue);