From 069c1e9dbbf2ca55a01cb1f2411cccb019ea67e1 Mon Sep 17 00:00:00 2001
From: TiSpH <gsrieexn@icloud.com>
Date: Thu, 20 Jul 2023 14:03:45 -0500
Subject: [PATCH 1/2] =?UTF-8?q?fix:=200=E6=97=B6=E7=9A=84=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=A0=E6=B3=95=E6=8F=90=E5=89=8D?=
 =?UTF-8?q?=E9=87=8D=E5=90=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
index b992b3ca5d..5370bf719b 100644
--- a/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/TaskQueueViewModel.cs
@@ -261,6 +261,13 @@ namespace MaaWpfGui.ViewModels.UI
                                                       Instances.SettingsViewModel.TimerModels.Timers[i].Min,
                                                       0);
                     DateTime restartDateTime = startTime.AddMinutes(-2);
+
+                    // 确保0点的定时会在当日的23:58重启
+                    if (restartDateTime.Day != startTime.Day)
+                    {
+                        restartDateTime = restartDateTime.AddDays(1);
+                    }
+
                     if (currentTime == restartDateTime)
                     {
                         timeToChangeConfig = true;

From cb1de611c4ee57b701a38a26522451aee5c06efa Mon Sep 17 00:00:00 2001
From: TiSpH <gsrieexn@icloud.com>
Date: Thu, 20 Jul 2023 20:54:00 -0500
Subject: [PATCH 2/2] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
index 163fe03724..932d2d0e14 100644
--- a/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/SettingsViewModel.cs
@@ -2502,7 +2502,7 @@ namespace MaaWpfGui.ViewModels.UI
             }
 
             string poolString = !string.IsNullOrEmpty(versionName) ? $" - {versionName}" : string.Empty;
-            rvm.WindowTitle = $"{prefix}MAA - {VersionId}{poolString} - {connectConfigName} ({ConnectAddress}) - {ClientName} - {CurrentConfiguration}";
+            rvm.WindowTitle = $"{prefix}MAA ({CurrentConfiguration}) - {VersionId}{poolString} - {connectConfigName} ({ConnectAddress}) - {ClientName}";
         }
 
         private readonly string _bluestacksConfig = ConfigurationHelper.GetValue(ConfigurationKeys.BluestacksConfigPath, string.Empty);