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

NPE

Browse source
This commit is contained in:
Victor Shcherb 2014-09-05 12:42:59 +02:00
parent 38a9410948
commit a0d9cf8e80
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java
View file

@ -662,7 +662,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
if (customization.getSelectedStage() != null) {
gpx = customization.getSelectedStage().getGpx();
List<SelectedGpxFile> sgpx = app.getSelectedGpxHelper().getSelectedGPXFiles();
if (gpx == null && sgpx.size() > 0) {
if (gpx == null){
app.getSelectedGpxHelper().clearAllGpxFileToShow();
} else if (sgpx.size() != 1 || sgpx.get(0).getGpxFile() != gpx) {
app.getSelectedGpxHelper().clearAllGpxFileToShow();
@ -672,12 +672,14 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
}
}
}
if (gpx != null) {
WptPt lp = gpx.getLastPoint();
if (lp != null) {
TargetPointsHelper targetPointsHelper = app.getTargetPointsHelper();
targetPointsHelper.navigateToPoint(new LatLon(lp.lat, lp.lon), true, -1, lp.name);
app.getSettings().navigateDialog(true);
}
}
String mode = stage != null ? stage.getMode() : tour.getMode();
if (!Algorithms.isEmpty(mode)) {
final ApplicationMode def = app.getSettings().getApplicationMode();
@ -689,7 +691,7 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
if (startOver && point != null) {
goToMap(a, new LatLon(point.lat, point.lon));
} else {
goToMap(a, null);
goToMap(a, stage.getStartPoint());
}
}