fix nullref from UnityEngine.EventSystems.BaseEventData.selectedObject.get()

David Kline (ANALOG) · David Kline (ANALOG) · commit d6c69d0b7660 · 2018-04-13T11:35:17.000-07:00
diff --git a/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/InputManager.cs b/Assets/HoloToolkit/Input/Scripts/Utilities/Managers/InputManager.cs
@@ -435,10 +435,10 @@ public void RaiseSourceUp(IInputSource source, uint sourceId, InteractionSourceP
                 pointerInputEventData.InputSource = source;
                 pointerInputEventData.SourceId = sourceId;
 
-                if (inputEventData.selectedObject != null)
+                if (pointerInputEventData.selectedObject != null)
                 {
-                    ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerUpHandler);
-                    ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerClickHandler);
+                    ExecuteEvents.ExecuteHierarchy(pointerInputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerUpHandler);
+                    ExecuteEvents.ExecuteHierarchy(pointerInputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerClickHandler);
                 }
 
                 pointerInputEventData.Clear();
@@ -477,9 +477,9 @@ public void RaiseSourceDown(IInputSource source, uint sourceId, InteractionSourc
                 pointerInputEventData.pressPosition = pointerInputEventData.position;
                 pointerInputEventData.pointerPressRaycast = pointerInputEventData.pointerCurrentRaycast;
 
-                if (inputEventData.selectedObject != null)
+                if (pointerInputEventData.selectedObject != null)
                 {
-                    ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerDownHandler);
+                    ExecuteEvents.ExecuteHierarchy(pointerInputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerDownHandler);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -435,10 +435,10 @@ public void RaiseSourceUp(IInputSource source, uint sourceId, InteractionSourceP`
`435`	`435`	`pointerInputEventData.InputSource = source;`
`436`	`436`	`pointerInputEventData.SourceId = sourceId;`
`437`	`437`
`438`		`- if (inputEventData.selectedObject != null)`
	`438`	`+ if (pointerInputEventData.selectedObject != null)`
`439`	`439`	`{`
`440`		`- ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerUpHandler);`
`441`		`- ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerClickHandler);`
	`440`	`+ ExecuteEvents.ExecuteHierarchy(pointerInputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerUpHandler);`
	`441`	`+ ExecuteEvents.ExecuteHierarchy(pointerInputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerClickHandler);`
`442`	`442`	`}`
`443`	`443`
`444`	`444`	`pointerInputEventData.Clear();`
`@@ -477,9 +477,9 @@ public void RaiseSourceDown(IInputSource source, uint sourceId, InteractionSourc`
`477`	`477`	`pointerInputEventData.pressPosition = pointerInputEventData.position;`
`478`	`478`	`pointerInputEventData.pointerPressRaycast = pointerInputEventData.pointerCurrentRaycast;`
`479`	`479`
`480`		`- if (inputEventData.selectedObject != null)`
	`480`	`+ if (pointerInputEventData.selectedObject != null)`
`481`	`481`	`{`
`482`		`- ExecuteEvents.ExecuteHierarchy(inputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerDownHandler);`
	`482`	`+ ExecuteEvents.ExecuteHierarchy(pointerInputEventData.selectedObject, pointerInputEventData, ExecuteEvents.pointerDownHandler);`
`483`	`483`	`}`
`484`	`484`	`}`
`485`	`485`	`}`