summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Mayard <bastien.mayard.ext@mappy.com>2016-03-29 18:19:30 +0200
committerTobrun <tobrun@mapbox.com>2016-03-31 10:22:00 +0200
commitb3474510222dad2de4a82b8d0321857ed1e02103 (patch)
tree65bd4e74ef8fd98c42dbe0eed6dd7fcaf8d07b52
parent9fc8cf39a8ee0704db70dd500d258cb2465c5a75 (diff)
downloadqtlocation-mapboxgl-b3474510222dad2de4a82b8d0321857ed1e02103.tar.gz
[android] #4517 - fix two tap gestures when zoomGesturesEnabled = false
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java4
1 files changed, 3 insertions, 1 deletions
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 60c79a1828..a83a7fdbc8 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());