Do correct and full cache clearing (for Index and search::Engine).

2 files changed, 6 insertions, 4 deletions

diff --git a/search/search_engine.cpp b/search/search_engine.cpp
index 33ebc572bb..50465cb20f 100644
--- a/search/search_engine.cpp
+++ b/search/search_engine.cpp
@@ -346,10 +346,12 @@ void Engine::ClearViewportsCache()
   m_pQuery->ClearCaches();
 }
 
-void Engine::ClearCaches()
+void Engine::ClearAllCaches()
 {
-  /// @todo Add m_pData->m_infoGetter clearing routine.
-  /// Now we have prereserved cache size.
+  threads::MutexGuard guard(m_searchMutex);
+
+  m_pQuery->ClearCaches();
+  m_pData->m_infoGetter.ClearCaches();
 }
 
 }  // namespace search
diff --git a/search/search_engine.hpp b/search/search_engine.hpp
index 380aee2965..fc7feff073 100644
--- a/search/search_engine.hpp
+++ b/search/search_engine.hpp
@@ -56,7 +56,7 @@ public:
   m2::RectD GetCountryBounds(string const & file) const;
 
   void ClearViewportsCache();
-  void ClearCaches();
+  void ClearAllCaches();
 
 private:
   static const int RESULTS_COUNT = 15;