Merge remote-tracking branch 'bwhtmn/ios9_multitasking' into 1ec5-ios9-multitasking-2309

1 files changed, 3 insertions, 3 deletions

diff --git a/platform/ios/MGLMapView.mm b/platform/ios/MGLMapView.mm
index 942c6563de..43721896f2 100644
--- a/platform/ios/MGLMapView.mm
+++ b/platform/ios/MGLMapView.mm
@@ -351,7 +351,6 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration)
     // observe app activity
     //
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willTerminate) name:UIApplicationWillTerminateNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(sleepGL:) name:UIApplicationWillResignActiveNotification 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(wakeGL:) name:UIApplicationDidBecomeActiveNotification object:nil];
@@ -427,8 +426,8 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration)
     MGLReachability *reachability = [notification object];
     if ( ! _isWaitingForRedundantReachableNotification && [reachability isReachable])
     {
-        mbgl::NetworkStatus::Reachable();
-    }
+            mbgl::NetworkStatus::Reachable();
+        }
     _isWaitingForRedundantReachableNotification = NO;
 }
 
@@ -747,6 +746,7 @@ std::chrono::steady_clock::duration secondsAsDuration(float duration)
         {
             self.glSnapshotView = [[UIImageView alloc] initWithFrame:self.glView.frame];
             self.glSnapshotView.autoresizingMask = self.glView.autoresizingMask;
+            self.glSnapshotView.contentMode = UIViewContentModeCenter;
             [self insertSubview:self.glSnapshotView aboveSubview:self.glView];
         }