Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-01-10 11:32:02 +01:00
commit 09e5c04a5b

View file

@ -778,8 +778,9 @@ public class RoutingHelper {
public void recalculateRouteDueToSettingsChange() { public void recalculateRouteDueToSettingsChange() {
//This should fix route-recalculation if settings change during ongoing calculation //This should fix route-recalculation if settings change during ongoing calculation
clearCurrentRoute(finalLocation, intermediatePoints); clearCurrentRoute(finalLocation, intermediatePoints);
recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, // Try re-initialize start point to check impact on Issue 2515
true, false); lastFixedLocation = TargetPoint.create(settings.getPointToStart(), settings.getStartPointDescription());
recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, true, false);
} }
private void recalculateRouteInBackground(boolean force, final Location start, final LatLon end, final List<LatLon> intermediates, private void recalculateRouteInBackground(boolean force, final Location start, final LatLon end, final List<LatLon> intermediates,