Fix NRE in EditorActiveProfileChangeHandler (#757)

NREs were thrown in the handler if no active profile was set.
XRTK · Jan 15, 2021 · beb24f6 · beb24f6
1 parent 9fff53a
commit beb24f6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Editor/EditorActiveProfileChangeHandler.cs b/Editor/EditorActiveProfileChangeHandler.cs
@@ -1,4 +1,4 @@
-// Copyright (c) XRTK. All rights reserved.
+// Copyright (c) XRTK. All rights reserved.
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
 using UnityEditor;
@@ -18,7 +18,7 @@ static EditorActiveProfileChangeHandler()
 
         private static void EditorApplication_hierarchyChanged()
         {
-            if (!MixedRealityToolkit.Instance.IsNull())
+            if (!(MixedRealityToolkit.Instance.IsNull() || MixedRealityToolkit.Instance.ActiveProfile.IsNull()))
             {
                 if (MixedRealityToolkit.Instance.ActiveProfile.IsInputSystemEnabled &&
                     Utilities.InputMappingAxisUtility.CheckUnityInputManagerMappings(Utilities.ControllerMappingUtilities.UnityInputManagerAxes))
@@ -33,4 +33,4 @@ private static void EditorApplication_hierarchyChanged()
             }
         }
     }
-}
+}