From 91dfd583969908a744d886608d5f3cd9f64fe40d Mon Sep 17 00:00:00 2001
From: uye <2396806385@qq.com>
Date: Sat, 27 Aug 2022 20:29:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=B3=E5=8D=A1=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=8A=E6=97=B6=E5=AF=BC=E8=88=AA=E8=87=B3=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=9A=84=E5=85=B3=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/TaskQueueViewModel.cs          | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
index 8b2b99ea38..282dc97012 100644
--- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
+++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs
@@ -225,6 +225,8 @@ namespace MeoAsstGui
             }
         }
 
+        private readonly string _closedStage = "_ClosedStage";
+
         /// <summary>
         /// Initializes items.
         /// </summary>
@@ -307,8 +309,8 @@ namespace MeoAsstGui
             }
             else
             {
-                AllStageList.Add(new CombData { Display = "已关闭活动", Value = "ClosedStage" });
-                Stage1 = "ClosedStage";
+                AllStageList.Add(new CombData { Display = "已关闭活动", Value = _closedStage });
+                Stage1 = _closedStage;
             }
 
             var resident = new List<CombData>
@@ -1460,7 +1462,7 @@ namespace MeoAsstGui
                         }
                     }
 
-                    if (_stage1 != "ClosedStage")
+                    if (_stage1 != _closedStage)
                     {
                         foreach (var stage in newList)
                         {
@@ -1479,10 +1481,21 @@ namespace MeoAsstGui
                         }
                     }
 
-                    return _stage3;
+                    foreach (var stage in newList)
+                    {
+                        if (stage.Value == _stage3)
+                        {
+                            return _stage3;
+                        }
+                    }
                 }
 
-                return _stage1;
+                if (_stage1 != _closedStage)
+                {
+                    return _stage1;
+                }
+
+                return string.Empty;
             }
         }