Fix concurrent issue in read/write of search params.

1 files changed, 14 insertions, 13 deletions

diff --git a/search/search_engine.cpp b/search/search_engine.cpp
index 50465cb20f..d8b149822e 100644
--- a/search/search_engine.cpp
+++ b/search/search_engine.cpp
@@ -142,24 +142,25 @@ void Engine::PrepareSearch(m2::RectD const & viewport,
 
 bool Engine::Search(SearchParams const & params, m2::RectD const & viewport)
 {
-  // Check for equal query.
-  if (!params.IsResetMode() &&
-      m_params.IsEqualCommon(params) &&
-      m2::IsEqual(m_viewport, viewport, epsEqualRects, epsEqualRects))
   {
-    if (!m_params.m_validPos)
-      return false;
+    threads::MutexGuard guard(m_updateMutex);
 
-    m2::PointD const p1 = GetViewportXY(m_params.m_lat, m_params.m_lon);
-    m2::PointD const p2 = GetViewportXY(params.m_lat, params.m_lon);
+    // Check for equal query.
+    if (!params.IsResetMode() &&
+        m_params.IsEqualCommon(params) &&
+        m2::IsEqual(m_viewport, viewport, epsEqualRects, epsEqualRects))
+    {
+      if (!m_params.m_validPos)
+        return false;
 
-    if (p1.EqualDxDy(p2, epsEqualPoints))
-      return false;
-  }
+      m2::PointD const p1 = GetViewportXY(m_params.m_lat, m_params.m_lon);
+      m2::PointD const p2 = GetViewportXY(params.m_lat, params.m_lon);
+
+      if (p1.EqualDxDy(p2, epsEqualPoints))
+        return false;
+    }
 
-  {
     // Assign new search params.
-    threads::MutexGuard guard(m_updateMutex);
     m_params = params;
     m_viewport = viewport;
   }