Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
e04c8f4d7d
1 changed files with 4 additions and 2 deletions
|
@ -616,8 +616,10 @@ public class MapActivityActions implements DialogProvider {
|
||||||
private void enterRoutePlanningModeImpl(GPXFile gpxFile, LatLon from, String fromName) {
|
private void enterRoutePlanningModeImpl(GPXFile gpxFile, LatLon from, String fromName) {
|
||||||
ApplicationMode mode = settings.DEFAULT_APPLICATION_MODE.get();
|
ApplicationMode mode = settings.DEFAULT_APPLICATION_MODE.get();
|
||||||
if (mode == ApplicationMode.DEFAULT) {
|
if (mode == ApplicationMode.DEFAULT) {
|
||||||
mode = ApplicationMode.CAR;
|
ApplicationMode selected = settings.APPLICATION_MODE.get();
|
||||||
|
mode = selected == ApplicationMode.DEFAULT ? ApplicationMode.CAR : selected;
|
||||||
}
|
}
|
||||||
|
|
||||||
OsmandApplication app = mapActivity.getMyApplication();
|
OsmandApplication app = mapActivity.getMyApplication();
|
||||||
TargetPointsHelper targets = app.getTargetPointsHelper();
|
TargetPointsHelper targets = app.getTargetPointsHelper();
|
||||||
app.getSettings().APPLICATION_MODE.set(mode);
|
app.getSettings().APPLICATION_MODE.set(mode);
|
||||||
|
|
Loading…
Reference in a new issue