From bf9197b3e46c950618dfad9ef8ae5819eaca0ae4 Mon Sep 17 00:00:00 2001
From: Clansty <i@gao4.pw>
Date: Sun, 26 May 2024 12:59:16 +0800
Subject: [PATCH] [F] Game crash after one track with new AIME with
 SkipToMusicSelection

---
 AquaMai/UX/QuickSkip.cs            |  2 ++
 AquaMai/UX/SkipToMusicSelection.cs | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/AquaMai/UX/QuickSkip.cs b/AquaMai/UX/QuickSkip.cs
index 2619ebd9..8cbd3c1a 100644
--- a/AquaMai/UX/QuickSkip.cs
+++ b/AquaMai/UX/QuickSkip.cs
@@ -34,6 +34,7 @@ namespace AquaMai.UX
             {
                 _keyPressFrames = 0;
                 MelonLogger.Msg(_container.processManager.Dump());
+                MelonLogger.Msg(Singleton<UserDataManager>.Instance.GetUserData(0).Dump());
                 return;
             }
 
@@ -50,6 +51,7 @@ namespace AquaMai.UX
                 {
                     // After login
                     case "Process.ModeSelect.ModeSelectProcess":
+                    case "Process.LoginBonus.LoginBonusProcess":
                     case "Process.RegionalSelectProcess":
                     case "Process.CharacterSelectProcess":
                     case "Process.TicketSelect.TicketSelectProcess":
diff --git a/AquaMai/UX/SkipToMusicSelection.cs b/AquaMai/UX/SkipToMusicSelection.cs
index e2c7a133..2be1a99f 100644
--- a/AquaMai/UX/SkipToMusicSelection.cs
+++ b/AquaMai/UX/SkipToMusicSelection.cs
@@ -1,5 +1,9 @@
 using HarmonyLib;
+using MAI2.Util;
 using Manager;
+using Manager.UserDatas;
+using MelonLoader;
+using Monitor;
 using Process;
 using Process.Information;
 
@@ -22,5 +26,15 @@ namespace AquaMai.UX
             ___container.processManager.ReleaseProcess(__instance);
             return false;
         }
+
+        [HarmonyPrefix]
+        [HarmonyPatch(typeof(MapResultMonitor), "Initialize")]
+        public static void MapResultMonitorPreInitialize(int monIndex)
+        {
+            var userData = Singleton<UserDataManager>.Instance.GetUserData(monIndex);
+            var index = userData.MapList.FindIndex((UserMapData m) => m.ID == userData.Detail.SelectMapID);
+            if (index >= 0) return;
+            userData.MapList.Clear();
+        }
     }
-}
+}
\ No newline at end of file