Merge pull request #257 from timcassell/fix-nullref-onapplicationquit

Reset static state from SubsystemRegistration
timcassell · Sep 5, 2023 · 6adf519 · 6adf519
2 parents 78eef35 + 09084c3
commit 6adf519
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/Package/UnityHelpers/Internal/PromiseBehaviour.cs b/Package/UnityHelpers/Internal/PromiseBehaviour.cs
@@ -27,6 +27,15 @@ internal static void InitializePromiseConfig()
             PromiseBehaviour.Initialize();
         }
 
+        // AppDomain reload could be disabled in editor, so we need to explicitly reset static fields.
+        // See https://github.com/timcassell/ProtoPromise/issues/204
+        // https://docs.unity3d.com/Manual/DomainReloading.html
+        [RuntimeInitializeOnLoadMethod((RuntimeInitializeLoadType) 4)] // SubsystemRegistration
+        internal static void ResetStaticState()
+        {
+            PromiseBehaviour.ResetStaticState();
+        }
+
 #if !PROTO_PROMISE_DEVELOPER_MODE
         [DebuggerNonUserCode, StackTraceHidden]
 #endif
@@ -108,6 +117,7 @@ private void OnDestroy()
                 {
                     UnityEngine.Debug.LogError("PromiseBehaviour destroyed! Removing PromiseSynchronizationContext from Promise.Config.ForegroundContext. PromiseYielder functions will stop working.");
                     ResetConfig();
+                    ResetStaticState();
                 }
             }
 
@@ -155,8 +165,6 @@ private void OnApplicationQuit()
                 _isApplicationQuitting = true;
                 if (Application.isEditor & s_instance == this)
                 {
-                    // AppDomain reload could be disabled in editor, so we need to explicitly reset static fields. See https://github.com/timcassell/ProtoPromise/issues/204
-                    ResetProcessors();
                     ResetConfig();
                     // Destroy this to prevent a memory leak.
                     Destroy(this);
@@ -167,7 +175,6 @@ private void OnApplicationQuit()
 
             private void ResetConfig()
             {
-                s_instance = null;
                 if (Promise.Config.ForegroundContext == _syncContext)
                 {
                     Promise.Config.ForegroundContext = null;
@@ -186,6 +193,15 @@ private void ResetConfig()
                 }
                 _syncContext.Execute(); // Clear out any pending callbacks.
             }
+
+            internal static void ResetStaticState()
+            {
+                if (!ReferenceEquals(s_instance, null))
+                {
+                    s_instance.ResetProcessors();
+                    s_instance = null;
+                }
+            }
         }
     }
 }