From 5cd9e1c816a42383863bb459e61fdf4919d76031 Mon Sep 17 00:00:00 2001
From: Ilya Grechuhin <i.grechuhin@gmail.com>
Date: Fri, 10 Mar 2017 11:02:01 +0300
Subject: [PATCH] [cp] [ios] Fixed cancelling of searching on map.

---
 iphone/Maps/Core/Search/MWMSearch.mm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm
index 2f2e5fa1f9..b3f7d98ca4 100644
--- a/iphone/Maps/Core/Search/MWMSearch.mm
+++ b/iphone/Maps/Core/Search/MWMSearch.mm
@@ -83,12 +83,14 @@ using TObservers = NSHashTable<__kindof TObserver>;
       {
         [self checkIsHotelResults:results];
         if (results.IsEndedNormal())
-          self.everywhereSearchCompleted = YES;
-        if (IPAD || self.searchOnMap)
         {
-          auto & f = GetFramework();
-          f.ShowSearchResults(m_everywhereResults);
-          f.SearchInViewport(m_viewportParams);
+          self.everywhereSearchCompleted = YES;
+          if (IPAD || self.searchOnMap)
+          {
+            auto & f = GetFramework();
+            f.ShowSearchResults(m_everywhereResults);
+            f.SearchInViewport(m_viewportParams);
+          }
         }
         [self onSearchCompleted];
       }
@@ -217,8 +219,9 @@ using TObservers = NSHashTable<__kindof TObserver>;
 
 + (void)reset
 {
-  GetFramework().CancelAllSearches();
   MWMSearch * manager = [MWMSearch manager];
+  manager.lastSearchTimestamp = 0;
+  GetFramework().CancelAllSearches();
   manager.everywhereSearchCompleted = NO;
   manager.viewportSearchCompleted = NO;
   if (manager->m_filterQuery != manager->m_everywhereParams.m_query)