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

Fix bug where PREV_APPLICATION_MODE is incorrectly overwritten

Browse source
This commit is contained in:
sonora 2012-09-07 18:37:05 +02:00
parent 383c14aa6e
commit fb81616a16
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -463,7 +463,10 @@ public class MapActivityActions implements DialogProvider {
return;
}
routingHelper.setAppMode(mode);
settings.PREV_APPLICATION_MODE.set(settings.APPLICATION_MODE.get());
// Do not overwrite PREV_APPLICATION_MODE if already navigating
if (!routingHelper.isFollowingMode()) {
settings.PREV_APPLICATION_MODE.set(settings.APPLICATION_MODE.get());
}
settings.FOLLOW_THE_ROUTE.set(false);
settings.FOLLOW_THE_GPX_ROUTE.set(null);
routingHelper.setFollowingMode(false);
@ -492,7 +495,10 @@ public class MapActivityActions implements DialogProvider {
}
ApplicationMode mode = getAppMode(buttons, settings);
// change global settings
settings.PREV_APPLICATION_MODE.set(settings.APPLICATION_MODE.get());
// Do not overwrite PREV_APPLICATION_MODE if already navigating
if (!routingHelper.isFollowingMode()) {
settings.PREV_APPLICATION_MODE.set(settings.APPLICATION_MODE.get());
}
boolean changed = settings.APPLICATION_MODE.set(mode);
if (changed) {
mapActivity.updateApplicationModeSettings();