From d52c99880c565b586cc024661f688aefefe131f5 Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Mon, 31 Jul 2023 19:04:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=85=B3=E9=97=AD=E6=A8=A1=E6=8B=9F?=
 =?UTF-8?q?=E5=99=A8=E6=9D=83=E9=99=90=E4=B8=8D=E5=A4=9F=E6=97=B6=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #5739
---
 .../ViewModels/UI/TaskQueueViewModel.cs       | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index 59051ee239..bad5753a87 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -1155,17 +1155,25 @@ namespace MaaWpfGui.ViewModels.UI
         /// <returns>是否关闭成功</returns>
         public bool KillEmulatorModeSwitcher()
         {
-            string emulatorMode = Instances.SettingsViewModel.ConnectConfig;
-            Instances.AsstProxy.Connected = false;
-            return emulatorMode switch
+            try
             {
-                "Nox" => KillEmulatorNox(),
-                "LDPlayer" => KillEmulatorLDPlayer(),
-                "XYAZ" => KillEmulatorXYAZ(),
-                "BlueStacks" => KillEmulatorBlueStacks(),
-                "MuMuEmulator12" => KillEmulatorMuMuEmulator12(),
-                _ => KillEmulatorbyWindow(),
-            };
+                string emulatorMode = Instances.SettingsViewModel.ConnectConfig;
+                Instances.AsstProxy.Connected = false;
+                return emulatorMode switch
+                {
+                    "Nox" => KillEmulatorNox(),
+                    "LDPlayer" => KillEmulatorLDPlayer(),
+                    "XYAZ" => KillEmulatorXYAZ(),
+                    "BlueStacks" => KillEmulatorBlueStacks(),
+                    "MuMuEmulator12" => KillEmulatorMuMuEmulator12(),
+                    _ => KillEmulatorbyWindow(),
+                };
+            }
+            catch (Exception e)
+            {
+                _logger.Error("Failed to close emulator: " + e.Message);
+                return false;
+            }
         }
 
         /// <summary>