Merge pull request #2655 from StephenHodgson/vNEXT-TouchScreen

Fixed collection modification in touch screen input source

Author: David Kline

Assets/MixedRealityToolkit/InputSystem/Sources/TouchscreenInputSource.cs

@@ -144,39 +144,46 @@ private void AddOrUpdateTouch(Touch touch, Ray ray)
 
         private void RemoveTouch(Touch touch)
         {
+            TouchPointer touchPointer = null;
+
             foreach (var knownTouch in activeTouches)
             {
                 if (knownTouch.TouchData.fingerId == touch.fingerId)
                 {
-                    if (touch.phase == TouchPhase.Ended)
-                    {
-                        if (knownTouch.Lifetime < K_CONTACT_EPSILON)
-                        {
-                            InputSystem.RaiseHoldCanceled(this, HoldAction);
-                        }
-                        else if (knownTouch.Lifetime < MaxTapContactTime)
-                        {
-                            InputSystem.RaiseHoldCanceled(this, HoldAction);
-                            InputSystem.RaisePointerClicked(knownTouch, PointerAction, knownTouch.TouchData.tapCount);
-                        }
-                        else
-                        {
-                            InputSystem.RaiseHoldCompleted(this, HoldAction);
-                        }
-                    }
-                    else
-                    {
-                        InputSystem.RaiseHoldCanceled(this, HoldAction);
-                    }
+                    touchPointer = knownTouch;
+                    break;
+                }
+            }
 
-                    InputSystem.RaisePointerUp(knownTouch, PointerAction);
-                    activeTouches.Remove(knownTouch);
+            if (touchPointer == null) { return; }
 
-                    if (activeTouches.Count == 0)
-                    {
-                        InputSystem.RaiseSourceLost(this);
-                    }
+            if (touch.phase == TouchPhase.Ended)
+            {
+                if (touchPointer.Lifetime < K_CONTACT_EPSILON)
+                {
+                    InputSystem.RaiseHoldCanceled(this, HoldAction);
                 }
+                else if (touchPointer.Lifetime < MaxTapContactTime)
+                {
+                    InputSystem.RaiseHoldCanceled(this, HoldAction);
+                    InputSystem.RaisePointerClicked(touchPointer, PointerAction, touchPointer.TouchData.tapCount);
+                }
+                else
+                {
+                    InputSystem.RaiseHoldCompleted(this, HoldAction);
+                }
+            }
+            else
+            {
+                InputSystem.RaiseHoldCanceled(this, HoldAction);
+            }
+
+            InputSystem.RaisePointerUp(touchPointer, PointerAction);
+            activeTouches.Remove(touchPointer);
+
+            if (activeTouches.Count == 0)
+            {
+                InputSystem.RaiseSourceLost(this);
             }
         }