Merge pull request #75 from ExtendRealityLtd/fix/creator-null-error

thestonefox · web-flow · commit f8677f400031 · 2021-12-06T16:37:27.000Z
fix(AxisCreator): prevent null exception if no axis found - fixes #74
diff --git a/Editor/UnityInputManagerAxisCreator.cs b/Editor/UnityInputManagerAxisCreator.cs
@@ -182,8 +182,10 @@ private static bool AxisDefined(string axisName)
             while (axesProperty.Next(false))
             {
                 SerializedProperty axis = axesProperty.Copy();
-                axis.Next(true);
-                if (axis.stringValue == axisName) return true;
+                if (axis.Next(true))
+                {
+                    if (axis.stringValue == axisName) return true;
+                }
             }
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -182,8 +182,10 @@ private static bool AxisDefined(string axisName)`
`182`	`182`	`while (axesProperty.Next(false))`
`183`	`183`	`{`
`184`	`184`	`SerializedProperty axis = axesProperty.Copy();`
`185`		`- axis.Next(true);`
`186`		`- if (axis.stringValue == axisName) return true;`
	`185`	`+ if (axis.Next(true))`
	`186`	`+ {`
	`187`	`+ if (axis.stringValue == axisName) return true;`
	`188`	`+ }`
`187`	`189`	`}`
`188`	`190`	`return false;`
`189`	`191`	`}`