From e6c1f600bfca8bc20441836ceb5c3494415678c5 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Fri, 2 Jun 2023 22:04:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E4=B8=8A=E4=B8=8B=E6=96=87=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Helper/WinAdapter.cs | 2 +- src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MaaWpfGui/Helper/WinAdapter.cs b/src/MaaWpfGui/Helper/WinAdapter.cs index 1733e0e321..589faa9219 100644 --- a/src/MaaWpfGui/Helper/WinAdapter.cs +++ b/src/MaaWpfGui/Helper/WinAdapter.cs @@ -26,7 +26,7 @@ namespace MaaWpfGui.Helper /// public class WinAdapter { - private static readonly ILogger _logger = Log.ForContext(); + private static readonly ILogger _logger = Log.ForContext(); private static readonly Dictionary _emulatorIdDict = new Dictionary { diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs index ad0d2da69e..2f872b63ac 100644 --- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs +++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs @@ -52,7 +52,7 @@ namespace MaaWpfGui.ViewModels.UI /// public class SettingsViewModel : Screen { - private static readonly ILogger _logger = Log.ForContext(); + private static readonly ILogger _logger = Log.ForContext(); [DllImport("MaaCore.dll")] private static extern IntPtr AsstGetVersion(); From 23a07f8d38d8f37fceae1c297656b187af7a1ac6 Mon Sep 17 00:00:00 2001 From: uye <2396806385@qq.com> Date: Fri, 2 Jun 2023 22:19:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=87=AA=E5=8A=A8=E5=90=AF=E5=8A=A8?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=99=A8=E6=97=B6=E6=A6=82=E7=8E=87=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E4=B8=8A=E4=B8=80=E4=B8=AA=E6=89=93=E5=BC=80=E7=9A=84?= =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix #4988 --- src/MaaWpfGui/Main/AsstProxy.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs index dd255c438e..731b1112ff 100644 --- a/src/MaaWpfGui/Main/AsstProxy.cs +++ b/src/MaaWpfGui/Main/AsstProxy.cs @@ -443,7 +443,7 @@ namespace MaaWpfGui.Main if (Instances.SettingsViewModel.RetryOnDisconnected) { Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("TryToStartEmulator"), UiLogColor.Error); - Instances.TaskQueueViewModel.KillEmulatorModeSwitcher(); + Instances.TaskQueueViewModel.KillEmulator(); await Task.Delay(3000); await Instances.TaskQueueViewModel.Stop(); Instances.TaskQueueViewModel.SetStopped();