Fix profiles reset and services reinitialized when already running (#646

)
XRTK · Jun 19, 2020 · 9f38fb3 · 9f38fb3
1 parent de181b5
commit 9f38fb3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/XRTK-Core/Packages/com.xrtk.core/Runtime/Services/MixedRealityToolkit.cs b/XRTK-Core/Packages/com.xrtk.core/Runtime/Services/MixedRealityToolkit.cs
@@ -92,6 +92,14 @@ public MixedRealityToolkitRootProfile ActiveProfile
         /// <param name="profile"></param>
         public void ResetProfile(MixedRealityToolkitRootProfile profile)
         {
+            if (Application.isEditor && Application.isPlaying)
+            {
+                // The application is running in editor play mode, can't
+                // reset profiles in this state as it will cause destruction
+                // and reinitialization of services in use.
+                return;
+            }
+
             if (isResetting)
             {
                 Debug.LogWarning("Already attempting to reset the root profile!");