From 5cca41c19f662f12d613fd12351462bf21c280f2 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Fri, 7 Jul 2023 09:22:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=B6=E4=B8=8B=E8=BD=BD=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8C=85=E5=90=8E=E5=8D=A1=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/UI/TaskQueueViewModel.cs | 2 +- .../ViewModels/UI/VersionUpdateViewModel.cs | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs index d90d7dfccd..17d46bde91 100644 --- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs @@ -238,7 +238,7 @@ namespace MaaWpfGui.ViewModels.UI _ = Task.Run(async () => { await Task.Delay(delayTime); - await Instances.SettingsViewModel.ManualUpdate(); + _ = Instances.SettingsViewModel.ManualUpdate(); }); } } diff --git a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs index 4adcc292b5..224cc6681a 100644 --- a/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/VersionUpdateViewModel.cs @@ -589,13 +589,19 @@ namespace MaaWpfGui.ViewModels.UI { if (Instances.SettingsViewModel.AutoInstallUpdatePackage) { - while (!runningState.GetIdle()) + _ = Task.Run(async () => { - Thread.Sleep(60000); - } + while (!runningState.GetIdle()) + { + await Task.Delay(60000); + } - Application.Current.Shutdown(); - Bootstrapper.RestartApplication(); + Application.Current.Dispatcher.Invoke(() => + { + Application.Current.Shutdown(); + Bootstrapper.RestartApplication(); + }); + }); return; }