From e94ca14b9269c3b95edc6e457bfd46422e7d47dd Mon Sep 17 00:00:00 2001
From: ExMix <rahuba.youri@mapswithme.com>
Date: Mon, 2 Nov 2015 22:31:33 +0300
Subject: [PATCH] review fixes

---
 .../drape_frontend_tests/memory_feature_index_tests.cpp       | 1 +
 drape_frontend/tile_info.cpp                                  | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drape_frontend/drape_frontend_tests/memory_feature_index_tests.cpp b/drape_frontend/drape_frontend_tests/memory_feature_index_tests.cpp
index 132c33bcfa..24c146555c 100644
--- a/drape_frontend/drape_frontend_tests/memory_feature_index_tests.cpp
+++ b/drape_frontend/drape_frontend_tests/memory_feature_index_tests.cpp
@@ -155,6 +155,7 @@ namespace
     virtual void Do()
     {
       vector<FeatureID> result;
+      df::MemoryFeatureIndex::Lock lock(m_index);
       m_index.ReadFeaturesRequest(m_features, result);
       MarkNodesAsReaded(m_features, result);
     }
diff --git a/drape_frontend/tile_info.cpp b/drape_frontend/tile_info.cpp
index 53c236d07a..549b30634c 100644
--- a/drape_frontend/tile_info.cpp
+++ b/drape_frontend/tile_info.cpp
@@ -57,13 +57,12 @@ void TileInfo::ReadFeatures(MapDataProvider const & model, MemoryFeatureIndex &
   // Reading can be interrupted by exception throwing
   MY_SCOPE_GUARD(ReleaseReadTile, bind(&EngineContext::EndReadTile, m_context.get()));
 
-  ReadFeatureIndex(model);
-
   vector<FeatureID> featuresToRead;
   {
     MemoryFeatureIndex::Lock lock(memIndex);
     UNUSED_VALUE(lock);
 
+    ReadFeatureIndex(model);
     CheckCanceled();
     featuresToRead.reserve(AverageFeaturesCount);
     memIndex.ReadFeaturesRequest(m_featureInfo, featuresToRead);
@@ -92,7 +91,6 @@ bool TileInfo::IsCancelled() const
 void TileInfo::ProcessID(FeatureID const & id)
 {
   m_featureInfo.push_back(id);
-  CheckCanceled();
 }
 
 void TileInfo::InitStylist(FeatureType const & f, Stylist & s)