pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] fixed crash when rotating device

Browse source
This commit is contained in:
o.bolovintseva 2019-01-15 17:56:03 +03:00 • committed by Aleksey Belousov
parent b551cef769
commit 49a3f8109f
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
iphone/Maps/UI/Search/MWMSearchManager.mm
View file

@ -222,7 +222,7 @@ using Observers = NSHashTable<Observer>;
- (void)updateTopController
{
UIViewController * selfTopVC = self.topController;
if ([selfTopVC isEqual:self.navigationController.topViewController])
if (!selfTopVC || [selfTopVC isEqual:self.navigationController.topViewController])
return;
NSMutableArray * viewControllers = [self.navigationController.viewControllers mutableCopy];
viewControllers[0] = selfTopVC;
@ -369,8 +369,7 @@ using Observers = NSHashTable<Observer>;
{
if (!_navigationController)
{
_navigationController =
[[UINavigationController alloc] initWithRootViewController:self.topController];
_navigationController = [[UINavigationController alloc] init];
[self.contentView addSubview:_navigationController.view];
_navigationController.navigationBarHidden = YES;
}
@ -383,7 +382,7 @@ using Observers = NSHashTable<Observer>;
self.noMapsController = nil;
switch (self.state)
{
case MWMSearchManagerStateHidden: return self.navigationController.topViewController;
case MWMSearchManagerStateHidden: return nil;
case MWMSearchManagerStateDefault:
{
if (GetFramework().GetStorage().HaveDownloadedCountries()) {