moved profile check after forloop has completed

StephenHodgson · StephenHodgson · commit 575a69450e65 · 2018-08-08T13:55:51.000-07:00
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/BaseController.cs b/Assets/MixedRealityToolkit/_Core/Devices/BaseController.cs
@@ -107,12 +107,6 @@ public void SetupConfiguration(Type controllerType)
                         profileFound = true;
                     }
 
-                    if (!profileFound)
-                    {
-                        Debug.LogError($"No controller profile found for type {controllerType}, please ensure all controllers are defined in the configured MixedRealityControllerConfigurationProfile.");
-                        return;
-                    }
-
                     // Assign any known interaction mappings.
                     if (!controllerMappings[i].UseCustomInteractionMappings &&
                         controllerMappings[i].ControllerType.Type == controllerType &&
@@ -135,6 +129,11 @@ public void SetupConfiguration(Type controllerType)
                         }
                     }
                 }
+
+                if (!profileFound)
+                {
+                    Debug.LogError($"No controller profile found for type {controllerType}, please ensure all controllers are defined in the configured MixedRealityControllerConfigurationProfile.");
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -107,12 +107,6 @@ public void SetupConfiguration(Type controllerType)`
`107`	`107`	`profileFound = true;`
`108`	`108`	`}`
`109`	`109`
`110`		`- if (!profileFound)`
`111`		`- {`
`112`		`- Debug.LogError($"No controller profile found for type {controllerType}, please ensure all controllers are defined in the configured MixedRealityControllerConfigurationProfile.");`
`113`		`- return;`
`114`		`- }`
`115`		`-`
`116`	`110`	`// Assign any known interaction mappings.`
`117`	`111`	`if (!controllerMappings[i].UseCustomInteractionMappings &&`
`118`	`112`	`controllerMappings[i].ControllerType.Type == controllerType &&`
`@@ -135,6 +129,11 @@ public void SetupConfiguration(Type controllerType)`
`135`	`129`	`}`
`136`	`130`	`}`
`137`	`131`	`}`
	`132`	`+`
	`133`	`+ if (!profileFound)`
	`134`	`+ {`
	`135`	`+ Debug.LogError($"No controller profile found for type {controllerType}, please ensure all controllers are defined in the configured MixedRealityControllerConfigurationProfile.");`
	`136`	`+ }`
`138`	`137`	`}`
`139`	`138`	`}`
`140`	`139`