aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@mapbox.com>2018-07-18 23:47:14 -0400
committerJulian Rex <julian.rex@mapbox.com>2018-07-18 23:47:14 -0400
commite6f9fccf5e7396d1ddf10795235d68c55b131f75 (patch)
tree74428c93dcf50b24a8e050c9591d1e97c8958dba
parent13cce334008a8f02225dce40113cc002e1125f01 (diff)
Clear location manager's delegate when deallocating mapupstream/jrex/background-timeout-handling
-rw-r--r--platform/ios/src/MGLMapView.mm2
m---------platform/ios/vendor/mapbox-events-ios0
2 files changed, 2 insertions, 0 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm
index 1bbda9438..8d21575ea 100644
--- a/platform/ios/src/MGLMapView.mm
+++ b/platform/ios/src/MGLMapView.mm
@@ -653,6 +653,8 @@ public:
{
[_reachability stopNotifier];
+ _locationManager.delegate = nil;
+
[[UIDevice currentDevice] endGeneratingDeviceOrientationNotifications];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[_attributionButton removeObserver:self forKeyPath:@"hidden"];
diff --git a/platform/ios/vendor/mapbox-events-ios b/platform/ios/vendor/mapbox-events-ios
-Subproject 291bd27e5027148c03041a80532a95bb4682cde
+Subproject 4b1f648feae018848ebea7c647df562577c19ce