fz-mirrors/MaaAssistantArknights
0
0
Fork 0
mirror of https://github.com/MaaAssistantArknights/MaaAssistantArknights.git synced 2026-07-16 09:50:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'MaaAssistantArknights:dev' into dev

Browse Source
This commit is contained in:
zayn_lie
2023-06-02 22:24:58 +08:00
committed by GitHub
parent 85fa863e2b 23a07f8d38
commit a668d6f54d
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MaaWpfGui/Helper/WinAdapter.cs
View File

@@ -26,7 +26,7 @@ namespace MaaWpfGui.Helper
/// </summary>
public class WinAdapter
{
private static readonly ILogger _logger = Log.ForContext<TaskQueueViewModel>();
private static readonly ILogger _logger = Log.ForContext<WinAdapter>();
private static readonly Dictionary<string, string> _emulatorIdDict = new Dictionary<string, string>
{

2
src/MaaWpfGui/Main/AsstProxy.cs
View File

@@ -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();

2
src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
View File

@@ -52,7 +52,7 @@ namespace MaaWpfGui.ViewModels.UI
/// </summary>
public class SettingsViewModel : Screen
{
private static readonly ILogger _logger = Log.ForContext<TaskQueueViewModel>();
private static readonly ILogger _logger = Log.ForContext<SettingsViewModel>();
[DllImport("MaaCore.dll")]
private static extern IntPtr AsstGetVersion();