Now able to access initialized SingletonBehaviour.Instance in background thread

lawwong · lawwong · commit f79d3393fea6 · 2021-05-11T11:23:49.000+08:00
diff --git a/Assets/HTC.UnityPlugin/Utility/SingletonBehaviour.cs b/Assets/HTC.UnityPlugin/Utility/SingletonBehaviour.cs
@@ -32,12 +32,12 @@ public static T Instance
 
         public static void Initialize()
         {
-            if (!Application.isPlaying || s_isApplicationQuitting) { return; }
-
             lock (s_lock)
             {
                 if (s_instance != null) { return; }
 
+                if (!Application.isPlaying || s_isApplicationQuitting) { return; }
+
                 var instances = FindObjectsOfType<T>();
                 if (instances.Length > 0)
                 {

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ public static T Instance`
`32`	`32`
`33`	`33`	`public static void Initialize()`
`34`	`34`	`{`
`35`		`- if (!Application.isPlaying \|\| s_isApplicationQuitting) { return; }`
`36`		`-`
`37`	`35`	`lock (s_lock)`
`38`	`36`	`{`
`39`	`37`	`if (s_instance != null) { return; }`
`40`	`38`
	`39`	`+ if (!Application.isPlaying \|\| s_isApplicationQuitting) { return; }`
	`40`	`+`
`41`	`41`	`var instances = FindObjectsOfType<T>();`
`42`	`42`	`if (instances.Length > 0)`
`43`	`43`	`{`