Merge branch 'master' of ssh://github.com/osmandapp/Osmand

OsmAnd/src/net/osmand/plus/helpers/AvoidSpecificRoads.java

@@ -125,7 +125,7 @@ public class AvoidSpecificRoads {
 			}
 			
 		});
-		bld.setPositiveButton(R.string.default_buttons_ok, null);
+		bld.setPositiveButton(R.string.close, null);
 		bld.show();
 	}
 	

OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java

@@ -772,7 +772,7 @@ public class RoutingHelper {
 	}
 	
 	public void recalculateRouteDueToSettingsChange() {
-		//See if this fixes route-recalculation if settings change during ongoing calculation
+		//This should fix route-recalculation if settings change during ongoing calculation
 		clearCurrentRoute(finalLocation, intermediatePoints);
 		recalculateRouteInBackground(true, lastFixedLocation, finalLocation, intermediatePoints, currentGPXRoute, route, 
 				true, false);

OsmAnd/src/net/osmand/plus/views/controls/MapRouteInfoControl.java

@@ -85,12 +85,15 @@ public class MapRouteInfoControl extends MapControls implements IRouteInformatio
 					//if (!routingHelper.isRouteBeingCalculated()) {
 					//	getTargets().setStartPoint(latlon, true, null);
 					//}
-					//or like this:
-					//	routingHelper.recalculateRouteDueToSettingsChange();
 					//-----------------
 			}
 			contextMenu.setLocation(latlon, null);
 			showDialog();
+				//-Test code only--
+				//Try force resuming route re-caculation if stopped due to Issue2515
+				routingHelper.recalculateRouteDueToSettingsChange();
+				routingHelper.recalculateRouteDueToSettingsChange();
+				//-----------------
 			return true;
 		}
 		return super.onSingleTap(point, tileBox);