Merge pull request #31 from SimonDarksideJ/vNEXT-InputActionRules_ProcessRulesFix

input action rules process rules fix

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/MixedRealityInputManager.cs

@@ -1767,59 +1767,59 @@ private MixedRealityInputAction ProcessRules_Internal<T1, T2>(MixedRealityInputA
 
         private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, bool criteria)
         {
-            if (CurrentInputActionRulesProfile != null)
+            if (CurrentInputActionRulesProfile != null && CurrentInputActionRulesProfile.InputActionRulesDigital?.Length > 0)
             {
-                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesDigital, criteria);
+                return ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesDigital, criteria);
             }
 
             return inputAction;
         }
 
         private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, float criteria)
         {
-            if (CurrentInputActionRulesProfile != null)
+            if (CurrentInputActionRulesProfile != null && CurrentInputActionRulesProfile.InputActionRulesSingleAxis?.Length > 0)
             {
-                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesSingleAxis, criteria);
+                return ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesSingleAxis, criteria);
             }
 
             return inputAction;
         }
 
         private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, Vector2 criteria)
         {
-            if (CurrentInputActionRulesProfile != null)
+            if (CurrentInputActionRulesProfile != null && CurrentInputActionRulesProfile.InputActionRulesDualAxis?.Length > 0)
             {
-                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesDualAxis, criteria);
+                return ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesDualAxis, criteria);
             }
 
             return inputAction;
         }
 
         private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, Vector3 criteria)
         {
-            if (CurrentInputActionRulesProfile != null)
+            if (CurrentInputActionRulesProfile != null && CurrentInputActionRulesProfile.InputActionRulesVectorAxis?.Length > 0)
             {
-                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesVectorAxis, criteria);
+                return ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesVectorAxis, criteria);
             }
 
             return inputAction;
         }
 
         private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, Quaternion criteria)
         {
-            if (CurrentInputActionRulesProfile != null)
+            if (CurrentInputActionRulesProfile != null && CurrentInputActionRulesProfile.InputActionRulesQuaternionAxis?.Length > 0)
             {
-                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesQuaternionAxis, criteria);
+                return ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesQuaternionAxis, criteria);
             }
 
             return inputAction;
         }
 
         private MixedRealityInputAction ProcessRules(MixedRealityInputAction inputAction, MixedRealityPose criteria)
         {
-            if (CurrentInputActionRulesProfile != null)
+            if (CurrentInputActionRulesProfile != null && CurrentInputActionRulesProfile.InputActionRulesPoseAxis?.Length > 0)
             {
-                ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesPoseAxis, criteria);
+                return ProcessRules_Internal(inputAction, CurrentInputActionRulesProfile.InputActionRulesPoseAxis, criteria);
             }
 
             return inputAction;