From b3474510222dad2de4a82b8d0321857ed1e02103 Mon Sep 17 00:00:00 2001
From: Bastien Mayard <bastien.mayard.ext@mappy.com>
Date: Tue, 29 Mar 2016 18:19:30 +0200
Subject: [PATCH] [android] #4517 - fix two tap gestures when
 zoomGesturesEnabled = false

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapView.java      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
index 60c79a182..a83a7fdbc 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
@@ -1429,7 +1429,9 @@ public class MapView extends FrameLayout {
 
             case MotionEvent.ACTION_POINTER_DOWN:
                 // Second pointer down
-                mTwoTap = event.getPointerCount() == 2;
+                mTwoTap = event.getPointerCount() == 2
+                        && !mDestroyed
+                        && mMapboxMap.getUiSettings().isZoomGesturesEnabled();
                 if (mTwoTap) {
                     // Confirmed 2nd Finger Down
                     trackGestureEvent(MapboxEvent.GESTURE_TWO_FINGER_SINGLETAP, event.getX(), event.getY());