Update ControllerPopupWindow.cs (#644)

Fix potential NRE in controller popup window. Pulled out change from hands branch.
XRTK · Jun 17, 2020 · de181b5 · de181b5
1 parent c2723f3
commit de181b5
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs b/XRTK-Core/Packages/com.xrtk.core/Editor/ControllerPopupWindow.cs
@@ -131,7 +131,7 @@ public static void Show(MixedRealityControllerMappingProfile profile, Serialized
 
             window = (ControllerPopupWindow)CreateInstance(typeof(ControllerPopupWindow));
 
-            window.currentControllerName = profile.ControllerType.Type.Name;
+            window.currentControllerName = profile.ControllerType?.Type?.Name;
             window.titleContent = new GUIContent($"{window.currentControllerName} {handednessTitleText}Input Action Assignment");
             window.controllerDataProviderProfile = profile;
             window.currentInteractionProfiles = interactionMappingProfiles;