From f0827cc2ddafff5cf7681bd056c9b6f58f935177 Mon Sep 17 00:00:00 2001 From: Ilya Grechuhin Date: Tue, 16 Jan 2018 15:13:43 +0300 Subject: [PATCH] [MAPSME-6479] [ios] Fixed crash on iPad stop routing. --- .../MWMNavigationDashboardManager.mm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm index f2b1cc1644..4f74a33a08 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm @@ -152,7 +152,6 @@ using Observers = NSHashTable; - (void)stateHidden { self.taxiDataSource = nil; - [self.routePreview remove]; self.routePreview = nil; self.navigationInfoView.state = MWMNavigationInfoViewStateHidden; self.navigationInfoView = nil; @@ -237,7 +236,6 @@ using Observers = NSHashTable; - (void)onRouteStop { self.state = MWMNavigationDashboardStateHidden; } - (void)stateNavigation { - [self.routePreview remove]; self.routePreview = nil; self.navigationInfoView.state = MWMNavigationInfoViewStateNavigation; self.navigationControlView.isVisible = YES; @@ -390,6 +388,7 @@ using Observers = NSHashTable; return _taxiDataSource; } +@synthesize routePreview = _routePreview; - (MWMRoutePreview *)routePreview { if (!_routePreview) @@ -397,6 +396,14 @@ using Observers = NSHashTable; return _routePreview; } +- (void)setRoutePreview:(MWMRoutePreview *)routePreview +{ + if (routePreview == _routePreview) + return; + [_routePreview remove]; + _routePreview = routePreview; +} + - (MWMBaseRoutePreviewStatus *)baseRoutePreviewStatus { if (!_baseRoutePreviewStatus)