From bb8e84f015b79e8c53f4db70786e533b05067649 Mon Sep 17 00:00:00 2001
From: Ilya Grechuhin <i.grechuhin@gmail.com>
Date: Thu, 15 Oct 2015 15:31:04 +0300
Subject: [PATCH] [ios] Fixed menu state restoration.

---
 .../MapViewControls/MWMMapViewControlsManager.mm          | 5 +++--
 iphone/Maps/Classes/MapViewController.mm                  | 8 +-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
index cb90131177..645c2b0a57 100644
--- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
+++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm
@@ -322,8 +322,9 @@ extern NSString * const kAlohalyticsTapEventKey;
 
 - (MWMBottomMenuState)menuState
 {
-  if (self.menuController.state == MWMBottomMenuStateActive)
-    return MWMBottomMenuStateActive;
+  MWMBottomMenuState const state = self.menuController.state;
+  if (state != MWMBottomMenuStateHidden)
+    return state;
   return _menuState;
 }
 
diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 9a33573818..4d5d33a1b1 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -517,16 +517,10 @@ typedef NS_ENUM(NSUInteger, UserTouchesAction)
   self.controlsManager = [[MWMMapViewControlsManager alloc] initWithParentController:self];
 }
 
-- (void)viewDidAppear:(BOOL)animated
-{
-  [super viewDidAppear:animated];
-  self.menuRestoreState = self.controlsManager.menuState;
-}
-
 - (void)viewWillDisappear:(BOOL)animated
 {
   [super viewWillDisappear:animated];
-
+  self.menuRestoreState = self.controlsManager.menuState;
   GetFramework().SetUpdatesEnabled(false);
   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(orientationChanged:) name:UIDeviceOrientationDidChangeNotification object:nil];
 }