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

Merge pull request #3404 from igrechuhin/crash

Browse source 
[ios] Fixed crash on app start if location is denied.
This commit is contained in:
Vlad Mihaylenko 2016-06-01 17:00:41 +04:00
commit 04c09e194e
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm
View file

@ -58,7 +58,6 @@ NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger im
self.sideView.topBound = 0.0;
self.sideView.bottomBound = view.height;
self.zoomSwipeEnabled = NO;
[self processMyPositionStateModeEvent:location::PendingPosition];
}
return self;
}
@ -125,11 +124,14 @@ NSArray<UIImage *> * animationImages(NSString * animationTemplate, NSUInteger im
}
}
(self.locationMode, mode);
locBtn.imageView.animationDuration = 0.0;
locBtn.imageView.animationImages = images;
locBtn.imageView.animationRepeatCount = 1;
locBtn.imageView.image = images.lastObject;
[locBtn.imageView startAnimating];
if (images)
{
locBtn.imageView.animationDuration = 0.0;
locBtn.imageView.animationRepeatCount = 1;
locBtn.imageView.image = images.lastObject;
[locBtn.imageView startAnimating];
}
[self refreshLocationButtonState:mode];
self.locationMode = mode;
}

2
iphone/Maps/Classes/MapViewController.mm
View file

@ -397,6 +397,7 @@ BOOL gIsFirstMyPositionMode = YES;
return;
self.view.clipsToBounds = YES;
[MTRGManager setMyCom:YES];
[self processMyPositionStateModeEvent:location::PendingPosition];
}
- (void)mwm_refreshUI
@ -529,7 +530,6 @@ BOOL gIsFirstMyPositionMode = YES;
self.menuRestoreState = MWMBottomMenuStateInactive;
GetFramework().LoadBookmarks();
[MWMFrameworkListener addObserver:self];
[self processMyPositionStateModeEvent:location::PendingPosition];
}
#pragma mark - Open controllers