diff options
author | Jason Wray <jason@mapbox.com> | 2018-02-19 14:21:15 -0500 |
---|---|---|
committer | Jason Wray <jason@mapbox.com> | 2018-02-19 14:21:15 -0500 |
commit | 374bad18c04ae8fea574f85d2149af8aeffb8dcc (patch) | |
tree | c0842b2e77c5c69e28cee31e654addbef17237a4 /platform/ios/src/MGLMapView.mm | |
parent | 2cef23e3ff532faf3ddff10c26e1495b30f11c4a (diff) | |
parent | 9a30e252b53b654d9b756f839bd33f2ff6db1d91 (diff) | |
download | qtlocation-mapboxgl-374bad18c04ae8fea574f85d2149af8aeffb8dcc.tar.gz |
Merge tag 'ios-v3.7.5' into master
Diffstat (limited to 'platform/ios/src/MGLMapView.mm')
-rw-r--r-- | platform/ios/src/MGLMapView.mm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 6f2d5039be..cad14343a8 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -543,8 +543,9 @@ public: [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willTerminate) name:UIApplicationWillTerminateNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sleepGL:) name:UIApplicationDidEnterBackgroundNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wakeGL:) name:UIApplicationWillEnterForegroundNotification object:nil]; - [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sleepGL:) name:UIApplicationWillResignActiveNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(wakeGL:) name:UIApplicationDidBecomeActiveNotification object:nil]; + // As of 3.7.5, we intentionally do not listen for `UIApplicationWillResignActiveNotification` or call `sleepGL:` in response to it, as doing + // so causes a loop when asking for location permission. See: https://github.com/mapbox/mapbox-gl-native/issues/11225 [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(didReceiveMemoryWarning) name:UIApplicationDidReceiveMemoryWarningNotification object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(deviceOrientationDidChange:) name:UIDeviceOrientationDidChangeNotification object:nil]; |