[routing] Fix route rebuilding after pass checkpoint

2 files changed, 4 insertions, 1 deletions

diff --git a/routing/index_router.cpp b/routing/index_router.cpp
index eaeb05bce1..5aed3acab0 100644
--- a/routing/index_router.cpp
+++ b/routing/index_router.cpp
@@ -253,7 +253,7 @@ IRouter::ResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoint
   segments.push_back(IndexGraphStarter::kStartFakeSegment);
 
   Segment startSegment;
-  if (!FindClosestSegment(checkpoints.GetStart(), true /* isOutgoing */, graph, startSegment))
+  if (!FindClosestSegment(checkpoints.GetPointFrom(), true /* isOutgoing */, graph, startSegment))
     return IRouter::StartPointNotFound;
   
   size_t subrouteSegmentsBegin = 0;
diff --git a/routing/route.cpp b/routing/route.cpp
index 3b3164a431..bcbf5e4ef8 100644
--- a/routing/route.cpp
+++ b/routing/route.cpp
@@ -55,6 +55,9 @@ void Route::Swap(Route & rhs)
   m_altitudes.swap(rhs.m_altitudes);
   m_traffic.swap(rhs.m_traffic);
   m_routeSegments.swap(rhs.m_routeSegments);
+
+  swap(m_subrouteUid, rhs.m_subrouteUid);
+  swap(m_currentSubrouteIdx, rhs.m_currentSubrouteIdx);
   m_subrouteAttrs.swap(rhs.m_subrouteAttrs);
 }