From 610ffde230098bc8795be514fb8a9d61dc133cc8 Mon Sep 17 00:00:00 2001
From: uye <99072975+ABA2396@users.noreply.github.com>
Date: Sat, 4 May 2024 16:44:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BC=80=E5=85=B3=20MuMu=20=E6=9E=81?=
 =?UTF-8?q?=E9=80=9F=E6=93=8D=E6=8E=A7=E9=9C=80=E8=A6=81=E9=87=8D=E5=90=AF?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix #8980
---
 src/MaaWpfGui/Main/AsstProxy.cs               |  6 ++--
 .../ViewModels/UI/SettingsViewModel.cs        | 28 +++++++++++++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index 59f8910557..d40d8adea8 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -1554,9 +1554,11 @@ namespace MaaWpfGui.Main
         /// <returns>是否成功。</returns>
         public bool AsstConnect(ref string error)
         {
-            if (Instances.SettingsViewModel.MuMuEmulator12Extras.Enable)
+            switch (Instances.SettingsViewModel.ConnectConfig)
             {
-                AsstSetConnectionExtrasMuMu12(Instances.SettingsViewModel.MuMuEmulator12Extras.Config);
+                case "MuMuEmulator12":
+                    AsstSetConnectionExtrasMuMu12(Instances.SettingsViewModel.MuMuEmulator12Extras.Config);
+                    break;
             }
 
             if (Instances.SettingsViewModel.AutoDetectConnection)
diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
index 94c41924a2..0fc676b71c 100644
--- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
@@ -3295,7 +3295,13 @@ namespace MaaWpfGui.ViewModels.UI
                 get => _enable;
                 set
                 {
+                    if (_enable == value)
+                    {
+                        return;
+                    }
+
                     _enable = value;
+                    Instances.AsstProxy.Connected = false;
                     OnPropertyChanged();
                     ConfigurationHelper.SetValue(ConfigurationKeys.MuMu12ExtrasEnabled, value.ToString());
                 }
@@ -3349,12 +3355,24 @@ namespace MaaWpfGui.ViewModels.UI
                 }
             }
 
-            public string Config => JsonConvert.SerializeObject(new JObject()
+            public string Config
             {
-                ["path"] = EmulatorPath,
-                ["index"] = int.TryParse(Index, out var indexParse) ? indexParse : 0,
-                ["display"] = int.TryParse(Display, out var displayParse) ? displayParse : 0,
-            });
+                get
+                {
+                    if (!Enable)
+                    {
+                        return JsonConvert.SerializeObject(new JObject());
+                    }
+
+                    var configObject = new JObject
+                    {
+                        ["path"] = EmulatorPath,
+                        ["index"] = int.TryParse(Index, out var indexParse) ? indexParse : 0,
+                        ["display"] = int.TryParse(Display, out var displayParse) ? displayParse : 0,
+                    };
+                    return JsonConvert.SerializeObject(configObject);
+                }
+            }
 
             public MuMuEmulator12ConnectionExtras()
             {