Add a few checks

keveleigh · keveleigh · commit 1efd5d319e49 · 2020-01-06T16:51:27.000-08:00
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityDeviceManager.cs
@@ -320,7 +320,10 @@ public override void Enable()
 
             if (InputSystemProfile == null) { return; }
 
-            WindowsMixedRealityUtilities.WmrUtilitiesProvider = new WindowsMixedRealityUtilitiesProvider();
+            if (WindowsMixedRealityUtilities.WmrUtilitiesProvider == null)
+            {
+                WindowsMixedRealityUtilities.WmrUtilitiesProvider = new WindowsMixedRealityUtilitiesProvider();
+            }
 
             if (InputSystemProfile.GesturesProfile != null)
             {
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityUtilitiesProvider.cs b/Assets/MixedRealityToolkit.Providers/WindowsMixedReality/WindowsMixedRealityUtilitiesProvider.cs
@@ -3,7 +3,10 @@
 
 using System;
 using System.Runtime.InteropServices;
+
+#if UNITY_WSA
 using UnityEngine.XR.WSA;
+#endif // UNITY_WSA
 
 namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality
 {

Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,10 @@ public override void Enable()`
`320`	`320`
`321`	`321`	`if (InputSystemProfile == null) { return; }`
`322`	`322`
`323`		`- WindowsMixedRealityUtilities.WmrUtilitiesProvider = new WindowsMixedRealityUtilitiesProvider();`
	`323`	`+ if (WindowsMixedRealityUtilities.WmrUtilitiesProvider == null)`
	`324`	`+ {`
	`325`	`+ WindowsMixedRealityUtilities.WmrUtilitiesProvider = new WindowsMixedRealityUtilitiesProvider();`
	`326`	`+ }`
`324`	`327`
`325`	`328`	`if (InputSystemProfile.GesturesProfile != null)`
`326`	`329`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,10 @@`
`3`	`3`
`4`	`4`	`using System;`
`5`	`5`	`using System.Runtime.InteropServices;`
	`6`	`+`
	`7`	`+#if UNITY_WSA`
`6`	`8`	`using UnityEngine.XR.WSA;`
	`9`	`+#endif // UNITY_WSA`
`7`	`10`
`8`	`11`	`namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality`
`9`	`12`	`{`