Fixed a typo, not failing with null inputsource on a pointer.

valyard · valyard · commit 889b4551fbaf · 2017-09-20T15:18:41.000+03:00
diff --git a/Source/Assets/TouchScript/Scripts/Core/TouchManagerInstance.cs b/Source/Assets/TouchScript/Scripts/Core/TouchManagerInstance.cs
@@ -297,7 +297,7 @@ public void CancelPointer(int id, bool shouldReturn)
             Pointer pointer;
             if (idToPointer.TryGetValue(id, out pointer))
             {
-                pointer.InputSource.CancelPointer(pointer, shouldReturn);
+                if (pointer.InputSource != null) pointer.InputSource.CancelPointer(pointer, shouldReturn);
             }
         }
 
@@ -877,7 +877,7 @@ private void updateRemoved(List<int> pointers)
             for (var i = 0; i < removedCount; i++)
             {
                 var pointer = list[i];
-                pointer.InputSource.INTERNAL_DiscardPointer(pointer);
+                if (pointer.InputSource != null) pointer.InputSource.INTERNAL_DiscardPointer(pointer);
             }
             pointerListPool.Release(list);
 
@@ -937,7 +937,7 @@ private void updateCancelled(List<int> pointers)
             for (var i = 0; i < cancelledCount; i++)
             {
                 var pointer = list[i];
-                pointer.InputSource.INTERNAL_DiscardPointer(pointer);
+                if (pointer.InputSource != null) pointer.InputSource.INTERNAL_DiscardPointer(pointer);
             }
             pointerListPool.Release(list);
 
diff --git a/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/TouchHandler.cs b/Source/Assets/TouchScript/Scripts/InputSources/InputHandlers/TouchHandler.cs
@@ -75,7 +75,7 @@ public TouchHandler(PointerDelegate addPointer, PointerDelegate updatePointer, P
             touchPool.Name = "Touch";
 
 #if UNITY_5_6_OR_NEWER
-			updateSampler = CustomSampler.Create("[TouchScript] Update touch");
+			updateSampler = CustomSampler.Create("[TouchScript] Update Touch");
 #endif
         }
 

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ public void CancelPointer(int id, bool shouldReturn)`
`297`	`297`	`Pointer pointer;`
`298`	`298`	`if (idToPointer.TryGetValue(id, out pointer))`
`299`	`299`	`{`
`300`		`- pointer.InputSource.CancelPointer(pointer, shouldReturn);`
	`300`	`+ if (pointer.InputSource != null) pointer.InputSource.CancelPointer(pointer, shouldReturn);`
`301`	`301`	`}`
`302`	`302`	`}`
`303`	`303`
`@@ -877,7 +877,7 @@ private void updateRemoved(List<int> pointers)`
`877`	`877`	`for (var i = 0; i < removedCount; i++)`
`878`	`878`	`{`
`879`	`879`	`var pointer = list[i];`
`880`		`- pointer.InputSource.INTERNAL_DiscardPointer(pointer);`
	`880`	`+ if (pointer.InputSource != null) pointer.InputSource.INTERNAL_DiscardPointer(pointer);`
`881`	`881`	`}`
`882`	`882`	`pointerListPool.Release(list);`
`883`	`883`
`@@ -937,7 +937,7 @@ private void updateCancelled(List<int> pointers)`
`937`	`937`	`for (var i = 0; i < cancelledCount; i++)`
`938`	`938`	`{`
`939`	`939`	`var pointer = list[i];`
`940`		`- pointer.InputSource.INTERNAL_DiscardPointer(pointer);`
	`940`	`+ if (pointer.InputSource != null) pointer.InputSource.INTERNAL_DiscardPointer(pointer);`
`941`	`941`	`}`
`942`	`942`	`pointerListPool.Release(list);`
`943`	`943`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public TouchHandler(PointerDelegate addPointer, PointerDelegate updatePointer, P`
`75`	`75`	`touchPool.Name = "Touch";`
`76`	`76`
`77`	`77`	`#if UNITY_5_6_OR_NEWER`
`78`		`- updateSampler = CustomSampler.Create("[TouchScript] Update touch");`
	`78`	`+ updateSampler = CustomSampler.Create("[TouchScript] Update Touch");`
`79`	`79`	`#endif`
`80`	`80`	`}`
`81`	`81`