Fix potential weird exceptions on shutdown

monkeymanboy · Mar 23, 2024 · 3f929b6 · 3f929b6
1 parent 09c8ef8
commit 3f929b6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/BeatSaberMarkupLanguage/BSMLParser.cs b/BeatSaberMarkupLanguage/BSMLParser.cs
@@ -12,6 +12,9 @@
 using BeatSaberMarkupLanguage.TypeHandlers;
 using BeatSaberMarkupLanguage.Util;
 using UnityEngine;
+using UnityEngine.AddressableAssets;
+using UnityEngine.ResourceManagement.AsyncOperations;
+using UnityEngine.ResourceManagement.ResourceProviders;
 using Zenject;
 
 namespace BeatSaberMarkupLanguage
@@ -118,6 +121,11 @@ public BSMLParserParams Parse(string content, GameObject parent, object host = n
 
         public BSMLParserParams Parse(XmlNode parentNode, GameObject parent, object host = null)
         {
+            if (!IsMainMenuSceneLoaded())
+            {
+                return null;
+            }
+
             BSMLParserParams parserParams = new(host);
 
             FieldAccessOption fieldAccessOptions = FieldAccessOption.Auto;
@@ -450,6 +458,15 @@ private Dictionary<string, string> GetParameters(XmlNode node, Dictionary<string
             return parameters;
         }
 
+        private bool IsMainMenuSceneLoaded()
+        {
+            // Unity tends to unload all asset bundles before calling OnDestroy on everything when shutting down.
+            // Since scenes are now loaded through Addressables, we need to make sure asset bundles haven't been
+            // unloaded before parsing. Without this check, weird instantiation errors can pop up.
+            AsyncOperationHandle instance = Addressables.Instance.m_SceneInstances.FirstOrDefault(si => ((SceneInstance)si.Result).Scene.name == "MainMenu");
+            return instance.IsValid() && ((SceneProvider.SceneOp)instance.m_InternalOp).m_DepOp.Result.Select(op => op.Result).OfType<AssetBundleResource>().All(ab => ab.m_AssetBundle != null);
+        }
+
         public struct ComponentTypeWithData
         {
             public TypeHandler typeHandler;

diff --git a/BeatSaberMarkupLanguage/BeatSaberMarkupLanguage.csproj b/BeatSaberMarkupLanguage/BeatSaberMarkupLanguage.csproj
@@ -70,6 +70,10 @@
       <Private>False</Private>
       <Publicize>True</Publicize>
     </Reference>
+    <Reference Include="UnityEngine.AssetBundleModule">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="UnityEngine.CoreModule">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
       <Private>False</Private>
@@ -108,6 +112,16 @@
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\UnityEngine.UnityWebRequestModule.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="Unity.Addressables">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Unity.Addressables.dll</HintPath>
+      <Private>False</Private>
+      <Publicize>True</Publicize>
+    </Reference>
+    <Reference Include="Unity.ResourceManager">
+      <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\Unity.ResourceManager.dll</HintPath>
+      <Private>False</Private>
+      <Publicize>True</Publicize>
+    </Reference>
     <Reference Include="VRUI">
       <HintPath>$(BeatSaberDir)\Beat Saber_Data\Managed\VRUI.dll</HintPath>
       <Private>False</Private>