summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLloyd Sheng <i@lloydsheng.com>2018-07-18 14:29:06 +0800
committerGitHub <noreply@github.com>2018-07-18 14:29:06 +0800
commit284dd23ca4bf90d6f51bff5204844de7dafdf6b2 (patch)
treeeae3ca176694eb8834ea36f3f33e8a2bedc41b93
parentbffc60fefda049c8cde0843988c2b73ab87b6103 (diff)
downloadqtlocation-mapboxgl-284dd23ca4bf90d6f51bff5204844de7dafdf6b2.tar.gz
[iOS] Fix unbalanced change delimiter crash (#12148)
Fixed a crash that occurred when the user started a gesture before the drift animation for a previous gesture was complete.
-rw-r--r--platform/ios/CHANGELOG.md1
-rw-r--r--platform/ios/src/MGLMapView.mm1
2 files changed, 1 insertions, 1 deletions
diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md
index 95e92d0165..f424d05a8f 100644
--- a/platform/ios/CHANGELOG.md
+++ b/platform/ios/CHANGELOG.md
@@ -27,6 +27,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT
* Added `-[MGLMapSnapshot coordinateForPoint:]` that returns a map coordinate for a specified snapshot image point. ([#12221](https://github.com/mapbox/mapbox-gl-native/pull/12221))
* Reduced memory usage when collision debug mode is disabled. ([#12294](https://github.com/mapbox/mapbox-gl-native/issues/12294))
* Fixed a bug with annotation view touch handling when a non-zero `centerOffset` is specified. ([#12234](https://github.com/mapbox/mapbox-gl-native/pull/12234))
+* Fixed a crash that occurred when the user started a gesture before the drift animation for a previous gesture was complete. ([#12148](https://github.com/mapbox/mapbox-gl-native/pull/12148), [#12160](https://github.com/mapbox/mapbox-gl-native/issues/12160))
## 4.0.3 - June 22, 2018
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 14f6960f26..e4906e3688 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -1264,7 +1264,6 @@ public:
- (void)touchesBegan:(__unused NSSet<UITouch *> *)touches withEvent:(__unused UIEvent *)event
{
- _changeDelimiterSuppressionDepth = 0;
_mbglMap->setGestureInProgress(false);
if (self.userTrackingState == MGLUserTrackingStateBegan)
{