From 1ca3692a357e4a9215813117e17a61518f44f787 Mon Sep 17 00:00:00 2001 From: jmkiley Date: Wed, 17 May 2017 12:14:46 -0700 Subject: [PATCH 1/2] [ios] check for topmost viewcontroller for telemetry button --- platform/ios/src/MGLMapView.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index a4c9f5194c4..3864de86eac 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -1999,7 +1999,8 @@ - (void)presentTelemetryAlertController }]; [alertController addAction:participateAction]; - [self.window.rootViewController presentViewController:alertController + UIViewController *viewController = [self.window.rootViewController mgl_topMostViewController]; + [viewController presentViewController:alertController animated:YES completion:NULL]; } From 4c6bdf8845c221f43ef9bddb442084180db4fe16 Mon Sep 17 00:00:00 2001 From: jmkiley Date: Wed, 17 May 2017 13:19:51 -0700 Subject: [PATCH 2/2] [ios] changed indentation --- platform/ios/src/MGLMapView.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/ios/src/MGLMapView.mm b/platform/ios/src/MGLMapView.mm index 3864de86eac..4054099dbd2 100644 --- a/platform/ios/src/MGLMapView.mm +++ b/platform/ios/src/MGLMapView.mm @@ -2001,8 +2001,8 @@ - (void)presentTelemetryAlertController UIViewController *viewController = [self.window.rootViewController mgl_topMostViewController]; [viewController presentViewController:alertController - animated:YES - completion:NULL]; + animated:YES + completion:NULL]; } #pragma mark - Properties -