From 1bba16a3e16077c9ce96c820492abc4711abd999 Mon Sep 17 00:00:00 2001
From: Daria Volvenkova <d.volvenkova@corp.mail.ru>
Date: Fri, 2 Mar 2018 14:53:26 +0300
Subject: [PATCH] Fixed data race with bookmarks in InsertRoute.

---
 map/routing_manager.cpp         | 6 +++++-
 map/transit/transit_display.cpp | 5 ++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/map/routing_manager.cpp b/map/routing_manager.cpp
index fffc907617..9fb4054324 100644
--- a/map/routing_manager.cpp
+++ b/map/routing_manager.cpp
@@ -407,7 +407,11 @@ void RoutingManager::SetRouterImpl(RouterType type)
 
 void RoutingManager::RemoveRoute(bool deactivateFollowing)
 {
-  m_bmManager->GetEditSession().ClearGroup(UserMark::Type::TRANSIT);
+  GetPlatform().RunTask(Platform::Thread::Gui, [this]()
+  {
+    m_bmManager->GetEditSession().ClearGroup(UserMark::Type::TRANSIT);
+  });
+
 
   if (deactivateFollowing)
     SetPointsFollowingMode(false /* enabled */);
diff --git a/map/transit/transit_display.cpp b/map/transit/transit_display.cpp
index c6def25bb5..69dfd2a1b3 100644
--- a/map/transit/transit_display.cpp
+++ b/map/transit/transit_display.cpp
@@ -402,7 +402,10 @@ void TransitRouteDisplay::ProcessSubroute(vector<RouteSegment> const & segments,
   m_routeInfo.m_totalDistInMeters = prevDistance;
   m_routeInfo.m_totalTimeInSec = static_cast<int>(ceil(prevTime));
 
-  CreateTransitMarks(transitMarks);
+  GetPlatform().RunTask(Platform::Thread::Gui, [this, transitMarks]()
+  {
+    CreateTransitMarks(transitMarks);
+  });
 }
 
 void TransitRouteDisplay::CollectTransitDisplayInfo(vector<RouteSegment> const & segments,