[search] [assessment-tool] Minor fixes.

3 files changed, 7 insertions, 6 deletions

diff --git a/search/search_quality/assessment_tool/assessment_tool.cpp b/search/search_quality/assessment_tool/assessment_tool.cpp
index 5ce4631871..2df013d370 100644
--- a/search/search_quality/assessment_tool/assessment_tool.cpp
+++ b/search/search_quality/assessment_tool/assessment_tool.cpp
@@ -17,7 +17,6 @@ DEFINE_string(data_path, "", "Path to data directory");
 int main(int argc, char ** argv)
 {
   search::ChangeMaxNumberOfOpenFiles(search::kMaxOpenFiles);
-  search::CheckLocale();
 
   google::SetUsageMessage("Features collector tool.");
   google::ParseCommandLineFlags(&argc, &argv, true);
diff --git a/search/search_quality/assessment_tool/main_model.cpp b/search/search_quality/assessment_tool/main_model.cpp
index 1b2587b263..802e757d5c 100644
--- a/search/search_quality/assessment_tool/main_model.cpp
+++ b/search/search_quality/assessment_tool/main_model.cpp
@@ -1,13 +1,13 @@
 #include "search/search_quality/assessment_tool/main_model.hpp"
 
 #include "search/feature_loader.hpp"
+#include "search/search_params.hpp"
 #include "search/search_quality/assessment_tool/view.hpp"
+#include "search/search_quality/helpers.hpp"
 #include "search/search_quality/matcher.hpp"
 
 #include "map/framework.hpp"
 
-#include "search/search_params.hpp"
-
 #include "geometry/algorithm.hpp"
 #include "geometry/mercator.hpp"
 
@@ -44,6 +44,7 @@ MainModel::MainModel(Framework & framework)
                m_view->OnSampleChanged(index, false /* hasEdits */);
              })
 {
+  search::CheckLocale();
 }
 
 void MainModel::Open(string const & path)
diff --git a/search/search_quality/assessment_tool/search_request_runner.cpp b/search/search_quality/assessment_tool/search_request_runner.cpp
index 1977f51080..bba8b36ae9 100644
--- a/search/search_quality/assessment_tool/search_request_runner.cpp
+++ b/search/search_quality/assessment_tool/search_request_runner.cpp
@@ -159,11 +159,12 @@ void SearchRequestRunner::RunRequest(size_t index, bool background, size_t times
         }
 
         context.m_initialized = true;
+
+        if (background)
+          RunNextBackgroundRequest(timestamp);
       }
 
-      if (background)
-        RunNextBackgroundRequest(timestamp);
-      else
+      if (!background)
         m_updateViewOnResults(results);
     });
   };