From 4043522c295ef652fa54e6e7e701e26a2f2138e4 Mon Sep 17 00:00:00 2001
From: Ilya Grechuhin <i.grechuhin@gmail.com>
Date: Tue, 22 Mar 2016 14:32:26 +0300
Subject: [PATCH] [ios] Fixed bottom menu state restoration.

---
 .../MWMMapViewControlsManager.mm              | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index a184567901..6e2c4e4bc5 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -499,7 +499,7 @@ extern NSString * const kAlohalyticsTapEventKey;
   }
 
   self.navigationManager.state = MWMNavigationDashboardStatePlanning;
-  [self.menuController setPlanning];
+  self.menuState = MWMBottomMenuStatePlanning;
   GetFramework().BuildRoute(self.routeSource.Point(), self.routeDestination.Point(), 0 /* timeoutSec */);
   [self.navigationManager setRouteBuilderProgress:0.];
 }
@@ -569,7 +569,7 @@ extern NSString * const kAlohalyticsTapEventKey;
   self.disableStandbyOnRouteFollowing = NO;
   [MapsAppDelegate theApp].routingPlaneMode = MWMRoutingPlaneModeNone;
   [RouteState remove];
-  [self.menuController setInactive];
+  self.menuState = MWMBottomMenuStateInactive;
   [self resetRoutingPoint];
   [self navigationDashBoardDidUpdate];
   if ([MapsAppDelegate isAutoNightMode])
@@ -619,7 +619,7 @@ extern NSString * const kAlohalyticsTapEventKey;
     });
   }
   self.navigationManager.state = MWMNavigationDashboardStateReady;
-  [self.menuController setGo];
+  self.menuState = MWMBottomMenuStateGo;
 }
 
 - (void)routingHidden
@@ -688,7 +688,22 @@ extern NSString * const kAlohalyticsTapEventKey;
 - (void)setMenuState:(MWMBottomMenuState)menuState
 {
   _menuState = menuState;
-  self.menuController.state = self.hidden ? MWMBottomMenuStateHidden : menuState;
+  MWMBottomMenuState const state = self.hidden ? MWMBottomMenuStateHidden : menuState;
+  switch (state)
+  {
+    case MWMBottomMenuStateInactive:
+      [self.menuController setInactive];
+      break;
+    case MWMBottomMenuStatePlanning:
+      [self.menuController setPlanning];
+      break;
+    case MWMBottomMenuStateGo:
+      [self.menuController setGo];
+      break;
+    default:
+      self.menuController.state = state;
+      break;
+  }
 }
 
 - (MWMBottomMenuState)menuState