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

Fix bug 1838 and crash dismiss route

Browse source
This commit is contained in:
Victor Shcherb 2013-05-21 01:17:24 +02:00
parent 5653e5de30
commit c6fc88c410
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
View file

@ -121,7 +121,7 @@ public class TargetPointsHelper {
private void updateRouteAndReferesh(boolean updateRoute) { private void updateRouteAndReferesh(boolean updateRoute) {
if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() || if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() ||
routingHelper.isFollowingMode())) { routingHelper.isFollowingMode())) {
Location lastKnownLocation = ctx.getLastKnownLocation(); Location lastKnownLocation = routingHelper.getLastProjection();
routingHelper.setFinalAndCurrentLocation(settings.getPointToNavigate(), routingHelper.setFinalAndCurrentLocation(settings.getPointToNavigate(),
settings.getIntermediatePoints(), lastKnownLocation, routingHelper.getCurrentGPXRoute()); settings.getIntermediatePoints(), lastKnownLocation, routingHelper.getCurrentGPXRoute());
} }

2
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -1182,7 +1182,7 @@ public class MapActivityActions implements DialogProvider {
if (routingHelper.isRouteCalculated() || routingHelper.isFollowingMode() || routingHelper.isRouteBeingCalculated()) { if (routingHelper.isRouteCalculated() || routingHelper.isFollowingMode() || routingHelper.isRouteBeingCalculated()) {
// Stop the navigation // Stop the navigation
builder.setTitle(getString(R.string.stop_routing)); builder.setTitle(getString(R.string.cancel_route));
builder.setMessage(getString(R.string.stop_routing_confirm)); builder.setMessage(getString(R.string.stop_routing_confirm));
builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.default_buttons_yes, new DialogInterface.OnClickListener() {
@Override @Override