Merge pull request #5011 from bykoianko/release-70-FindRouteMSMT-optimization

Preventing cyclical calling of building route in case of some errors.

1 files changed, 12 insertions, 1 deletions

diff --git a/routing/car_router.cpp b/routing/car_router.cpp
index 0e8c013a70..1f4cd434e4 100644
--- a/routing/car_router.cpp
+++ b/routing/car_router.cpp
@@ -282,7 +282,18 @@ bool CarRouter::FindRouteMSMT(TFeatureGraphNodeVec const & sources,
       {
       case NoError: return true;
       case Cancelled: return false;
-      default: continue;
+      case NoCurrentPosition:
+        LOG(LERROR, ("NoCurrentPosition routing result returned by FindSingleRouteDispatcher()"));
+        return false;
+      case InconsistentMWMandRoute: return false;
+      case RouteFileNotExist: return false;
+      case StartPointNotFound: continue;
+      case EndPointNotFound: continue;
+      case PointsInDifferentMWM: return false;
+      case RouteNotFound: continue;
+      case NeedMoreMaps: return false;
+      case InternalError: return false;
+      case FileTooOld: return false;
       }
     }
   }