From 8985fb09206fbdcbe8f058df22486501b3aaac21 Mon Sep 17 00:00:00 2001 From: Alexander Borsuk Date: Tue, 23 Aug 2022 14:46:22 +0300 Subject: [PATCH] [ios] Fixed assert Signed-off-by: Alexander Borsuk --- iphone/Maps/Classes/MapViewController.mm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index f9e9a90e81..e19913a81f 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -399,7 +399,10 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; return NO; } - (UIStatusBarStyle)preferredStatusBarStyle { - return [self.controlsManager preferredStatusBarStyle]; + MWMMapViewControlsManager * manager = self.controlsManager; + if (manager) + return manager.preferredStatusBarStyle; + return UIStatusBarStyleDefault; } - (void)updateStatusBarStyle { @@ -613,7 +616,10 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing"; #pragma mark - Properties - (MWMMapViewControlsManager *)controlsManager { - NSAssert(self.isViewLoaded, @"Load the view first"); + if (!self.isViewLoaded) { + // TODO: Returns nil when called from MapViewController.preferredStatusBarStyle. + return nil; + } if (!_controlsManager) _controlsManager = [[MWMMapViewControlsManager alloc] initWithParentController:self]; return _controlsManager;