From 419da3bf59705c798d831d5ddfe7672fd118734c Mon Sep 17 00:00:00 2001
From: Alexander Boriskov <a.boriskov@corp.mail.ru>
Date: Wed, 24 Jun 2020 10:00:29 +0300
Subject: [PATCH] [iOS] Fallback to old search in navigation

https://jira.mail.ru/browse/MAPSME-14174
---
 iphone/Maps/Classes/MapViewController.mm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 44058012ad..bd5800fdf2 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -214,8 +214,13 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
   [self hidePlacePage];
 
   BOOL const isSearchResult = [MWMSearchManager manager].state == MWMSearchManagerStateResult;
+  BOOL const isNavigationDashboardHidden = [MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden;
   if (isSearchResult) {
-    [MWMSearchManager manager].state = MWMSearchManagerStateMapSearch;
+    if (isNavigationDashboardHidden) {
+      [MWMSearchManager manager].state = MWMSearchManagerStateMapSearch;
+    } else {
+      [MWMSearchManager manager].state = MWMSearchManagerStateHidden;
+    }
   }
 
   if (!switchFullScreenMode)
@@ -225,7 +230,6 @@ NSString *const kPP2BookmarkEditingSegue = @"PP2BookmarkEditing";
     return;
 
   BOOL const isSearchHidden = [MWMSearchManager manager].state == MWMSearchManagerStateHidden;
-  BOOL const isNavigationDashboardHidden = [MWMNavigationDashboardManager sharedManager].state == MWMNavigationDashboardStateHidden;
   if (isSearchHidden && isNavigationDashboardHidden) {
     self.controlsManager.hidden = !self.controlsManager.hidden;
   }