diff --git a/src/MaaWpfGui/Main/AsstProxy.cs b/src/MaaWpfGui/Main/AsstProxy.cs
index e7f7fd2cd1..ad59d5de84 100644
--- a/src/MaaWpfGui/Main/AsstProxy.cs
+++ b/src/MaaWpfGui/Main/AsstProxy.cs
@@ -552,12 +552,11 @@ namespace MaaWpfGui.Main
                     }
 
                 case AsstMsg.TaskChainStart:
-                    switch (taskChain)
+                    Instances.TaskQueueViewModel.FightTaskRunning = taskChain switch
                     {
-                        case "Fight":
-                            Instances.TaskQueueViewModel.FightTaskRunning = true;
-                            break;
-                    }
+                        "Fight" => true,
+                        _ => Instances.TaskQueueViewModel.FightTaskRunning
+                    };
 
                     Instances.TaskQueueViewModel.AddLog(LocalizationHelper.GetString("StartTask") + taskChain);
                     break;
diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
index e6bc7ab539..4f7dec809e 100644
--- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
@@ -2118,7 +2118,7 @@ namespace MaaWpfGui.ViewModels.UI
         /// Gets or sets 设置选择的编队
         /// </summary>
         // ReSharper disable once MemberCanBePrivate.Global
-        public List<CombinedData> FormationSelectList { get; set; }
+        public List<CombinedData> FormationSelectList { get; private set; }
 
         private int _creditFightSelectFormation = Convert.ToInt32(ConfigurationHelper.GetValue(ConfigurationKeys.CreditFightSelectFormation, "0"));