fixed race condisions

Author: zezba9000

Assets/VRstudios/XRInput/API/UnityEngine_XR.cs

@@ -27,7 +27,7 @@ public override void Init()
 
             // add existing devices (this is needed to handle OVR bug where left controller may not be added via callbacks)
             InputDevices.GetDevicesWithCharacteristics(InputDeviceCharacteristics.Controller, controllers);
-            foreach (var c in controllers) UpdateDevice(c, false);
+            foreach (var c in controllers.ToArray()) UpdateDevice(c, false);
 
             // watch for device changes
             InputDevices.deviceConnected += InputDevices_deviceConnected;

Assets/VRstudios/XRInput/XRInput.cs

@@ -36,7 +36,7 @@ public sealed class XRInput : MonoBehaviour
         public XRLoader loaderOverride;
         public XRInputAPIType apiType;
         private XRInputAPI api;
-        private bool disposeAPI;
+        private bool disposeAPI, apiInit;
 
         private const int controllerStateLength = 4;
         private int lastControllerCount;
@@ -61,7 +61,7 @@ private IEnumerator Start()
             singleton = this;
 
             // print version
-            Debug.Log("XRInput version: 1.0.9");
+            Debug.Log("XRInput version: 1.0.10");
 
             // wait for XR loader
             while (loader == null || !XRSettings.enabled)
@@ -130,6 +130,8 @@ private IEnumerator Start()
                 #if UNITY_EDITOR
                 UnityEditor.EditorApplication.playModeStateChanged += EditorApplication_playModeStateChanged;
                 #endif
+
+                apiInit = true;
             }
             catch (Exception e)
             {
@@ -153,6 +155,7 @@ private void OnDestroy()
             UnityEditor.EditorApplication.playModeStateChanged -= EditorApplication_playModeStateChanged;
             #endif
 
+            apiInit = false;
             if (disposeAPI && api != null)
             {
                 api.Dispose();
@@ -169,7 +172,7 @@ private void OnApplicationQuit()
 		private void Update()
         {
             // gather controller states from current API
-            if (api == null) return;
+            if (!apiInit) return;
 
             int controllerCount;
             bool leftSet, rightSet;

Assets/XR/Settings/Open XR Package Settings.asset

@@ -4614,7 +4614,7 @@ MonoBehaviour:
   - {fileID: 7982965482703915569}
   - {fileID: 7140447362601613340}
   - {fileID: 9170940577884563102}
-  m_renderMode: 0
+  m_renderMode: 1
   m_depthSubmissionMode: 0
 --- !u!114 &6169546649005359584
 MonoBehaviour:

Packages/manifest.json

@@ -20,7 +20,7 @@
     "com.unity.xr.management": "4.0.7",
     "com.unity.xr.mock-hmd": "1.3.0-preview.1",
     "com.unity.xr.oculus": "1.9.1",
-    "com.unity.xr.openxr": "1.2.3",
+    "com.unity.xr.openxr": "1.2.8",
     "com.unity.xr.picoxr": "file:../ExternalPackages/PicoXR_Platform_SDK-1.2.3_B55.tar.tgz",
     "com.unity.xr.windowsmr": "4.5.0",
     "com.valvesoftware.unity.openvr": "file:../ExternalPackages/com.valvesoftware.unity.openvr-1.1.4.tgz",

Packages/packages-lock.json

@@ -191,7 +191,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.xr.openxr": {
-      "version": "1.2.3",
+      "version": "1.2.8",
       "depth": 0,
       "source": "registry",
       "dependencies": {

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.14f1
-m_EditorVersionWithRevision: 2020.3.14f1 (d0d1bb862f9d)
+m_EditorVersion: 2020.3.15f2
+m_EditorVersionWithRevision: 2020.3.15f2 (6cf78cb77498)