fix: MonoSingleton destory check improved.

stan-osipov · web-flow · commit 2c3f3f106f7a · 2022-01-05T11:45:29.000+02:00
diff --git a/Runtime/Patterns/Singleton/MonoSingleton.cs b/Runtime/Patterns/Singleton/MonoSingleton.cs
@@ -29,7 +29,7 @@ public static T Instance
         {
             get
             {
-                if (s_ApplicationIsQuitting)
+                if (s_ApplicationIsQuitting || s_IsDestroyed)
                 {
                     Debug.LogError(
                         $"{typeof(T)} [MonoSingleton] is already destroyed. " +
@@ -94,4 +94,4 @@ protected virtual void OnApplicationQuit()
             s_ApplicationIsQuitting = true;
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public static T Instance`
`29`	`29`	`{`
`30`	`30`	`get`
`31`	`31`	`{`
`32`		`- if (s_ApplicationIsQuitting)`
	`32`	`+ if (s_ApplicationIsQuitting \|\| s_IsDestroyed)`
`33`	`33`	`{`
`34`	`34`	`Debug.LogError(`
`35`	`35`	`$"{typeof(T)} [MonoSingleton] is already destroyed. " +`
`@@ -94,4 +94,4 @@ protected virtual void OnApplicationQuit()`
`94`	`94`	`s_ApplicationIsQuitting = true;`
`95`	`95`	`}`
`96`	`96`	`}`
`97`		`-}`
	`97`	`+}`