check before setting active

StephenHodgson · StephenHodgson · commit f4beb50593b6 · 2018-09-11T11:27:26.000-07:00
diff --git a/Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Cursors/BaseCursor.cs b/Assets/MixedRealityToolkit-SDK/Features/UX/Scripts/Cursors/BaseCursor.cs
@@ -116,7 +116,8 @@ public float DefaultCursorDistance
         /// <inheritdoc />
         public virtual void SetVisibility(bool visible)
         {
-            if (PrimaryCursorVisual != null)
+            if (PrimaryCursorVisual != null &&
+                PrimaryCursorVisual.gameObject.activeInHierarchy)
             {
                 PrimaryCursorVisual.gameObject.SetActive(visible);
                 isVisible = visible;

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,8 @@ public float DefaultCursorDistance`
`116`	`116`	`/// <inheritdoc />`
`117`	`117`	`public virtual void SetVisibility(bool visible)`
`118`	`118`	`{`
`119`		`- if (PrimaryCursorVisual != null)`
	`119`	`+ if (PrimaryCursorVisual != null &&`
	`120`	`+ PrimaryCursorVisual.gameObject.activeInHierarchy)`
`120`	`121`	`{`
`121`	`122`	`PrimaryCursorVisual.gameObject.SetActive(visible);`
`122`	`123`	`isVisible = visible;`