summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Platform.Android
diff options
context:
space:
mode:
authorE.Z. Hart <hartez@users.noreply.github.com>2017-03-22 04:40:15 -0600
committerRui Marinho <me@ruimarinho.net>2017-03-22 10:42:01 +0000
commit69ff55a62fd2e35bd945513fcf594d3541ea6651 (patch)
tree95af8f8ec0ee362b64edae2d6e72cc5bccb9b875 /Xamarin.Forms.Platform.Android
parentf6fd1b670beda705d15573cb9f9de42b6b4b87cc (diff)
downloadxamarin-forms-69ff55a62fd2e35bd945513fcf594d3541ea6651.tar.gz
xamarin-forms-69ff55a62fd2e35bd945513fcf594d3541ea6651.tar.bz2
xamarin-forms-69ff55a62fd2e35bd945513fcf594d3541ea6651.zip
Add gesture disposed check to FrameRenderer (#829)
Diffstat (limited to 'Xamarin.Forms.Platform.Android')
-rw-r--r--Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs b/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs
index 1092f767..2b657b5e 100644
--- a/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs
@@ -82,6 +82,13 @@ namespace Xamarin.Forms.Platform.Android.AppCompat
ScaleGestureDetectorCompat.SetQuickScaleEnabled(_scaleDetector.Value, true);
handled = _scaleDetector.Value.OnTouchEvent(e);
}
+
+ if (_gestureDetector.IsValueCreated && _gestureDetector.Value.Handle == IntPtr.Zero)
+ {
+ // This gesture detector has already been disposed, probably because it's on a cell which is going away
+ return handled;
+ }
+
return _gestureDetector.Value.OnTouchEvent(e) || handled;
}