diff options
| author | Vlad Mihaylenko <vxmihaylenko@gmail.com> | 2017-03-09 18:00:19 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-09 18:00:19 +0300 |
| commit | 941e44c155804070590a4f00ace727976f644025 (patch) | |
| tree | c41530b55fd7fa88681d613ca09a8b3ce4603348 | |
| parent | 2b222f1bd1f23d3495c167753f819e87bb32e84e (diff) | |
| parent | 082fc1abfd30c984f28bfd8b504cac90c4cd15a5 (diff) | |
Merge pull request #5548 from darina/search-on-map-cancelling-fixbeta-667
[RELEASE ONLY] Fixed cancelling of searching on map.
| -rw-r--r-- | iphone/Maps/Core/Search/MWMSearch.mm | 15 |
1 files 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) |