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:40:15 +0000
commit7538350f6d750f5e29d011834cf36a17a1e045e3 (patch)
tree46aaec71e0820f448bbd3a5f8234301ba585fcd8 /Xamarin.Forms.Platform.Android
parentada46c3bc0c4d32ca2e404994e7ed3c723ba4a6a (diff)
downloadxamarin-forms-7538350f6d750f5e29d011834cf36a17a1e045e3.tar.gz
xamarin-forms-7538350f6d750f5e29d011834cf36a17a1e045e3.tar.bz2
xamarin-forms-7538350f6d750f5e29d011834cf36a17a1e045e3.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 6954654b..7c40ea80 100644
--- a/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/AppCompat/FrameRenderer.cs
@@ -83,6 +83,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;
}