Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-07-04 11:45:55 +02:00
commit 371ea43744

View file

@ -614,10 +614,13 @@ public class MapActivityActions implements DialogProvider {
}
private void enterRoutePlanningModeImpl(GPXFile gpxFile, LatLon from, String fromName) {
ApplicationMode mode = settings.DEFAULT_APPLICATION_MODE.get();
if (mode == ApplicationMode.DEFAULT) {
ApplicationMode selected = settings.APPLICATION_MODE.get();
mode = selected == ApplicationMode.DEFAULT ? ApplicationMode.CAR : selected;
ApplicationMode selected = settings.APPLICATION_MODE.get();
if( selected != ApplicationMode.DEFAULT) {
mode = selected;
} else if (mode == ApplicationMode.DEFAULT) {
mode = ApplicationMode.CAR ;
}
OsmandApplication app = mapActivity.getMyApplication();