Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add one more occasion where stop routing button is needed

Browse source
This commit is contained in:
sonora 2012-02-02 00:31:37 +01:00
parent a4aedee2d4
commit 64b4ce6973
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -1038,7 +1038,7 @@ public class MapActivity extends TrackedActivity implements IMapLocationListener
MenuItem navigateToPointMenu = menu.findItem(R.id.map_navigate_to_point); MenuItem navigateToPointMenu = menu.findItem(R.id.map_navigate_to_point);
if (navigateToPointMenu != null) { if (navigateToPointMenu != null) {
if (settings.getPointToNavigate() != null) { if (settings.getPointToNavigate() != null) {
navigateToPointMenu.setTitle((routingHelper.isRouteCalculated() || routingHelper.isFollowingMode()) ? R.string.stop_routing : R.string.stop_navigation); navigateToPointMenu.setTitle((routingHelper.isRouteCalculated() || routingHelper.isFollowingMode() || routingHelper.isRouteBeingCalculated()) ? R.string.stop_routing : R.string.stop_navigation);
navigateToPointMenu.setVisible(true); navigateToPointMenu.setVisible(true);
} else { } else {
navigateToPointMenu.setVisible(false); navigateToPointMenu.setVisible(false);
@ -1125,7 +1125,7 @@ public class MapActivity extends TrackedActivity implements IMapLocationListener
return true; return true;
case R.id.map_navigate_to_point: case R.id.map_navigate_to_point:
if (mapLayers.getNavigationLayer().getPointToNavigate() != null) { if (mapLayers.getNavigationLayer().getPointToNavigate() != null) {
if(routingHelper.isRouteCalculated() || routingHelper.isFollowingMode()){ if(routingHelper.isRouteCalculated() || routingHelper.isFollowingMode() || routingHelper.isRouteBeingCalculated()){
routingHelper.setFinalAndCurrentLocation(null, routingHelper.getCurrentLocation(), routingHelper.getCurrentGPXRoute()); routingHelper.setFinalAndCurrentLocation(null, routingHelper.getCurrentLocation(), routingHelper.getCurrentGPXRoute());
} else { } else {
navigateToPoint(null); navigateToPoint(null);