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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-03-05 09:28:21 +01:00
commit 71245cfacf
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/views/GPXLayer.java
View file

@ -368,10 +368,13 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) { List<SelectedGpxFile> selectedGPXFiles, DrawSettings settings) {
for (SelectedGpxFile g : selectedGPXFiles) { for (SelectedGpxFile g : selectedGPXFiles) {
GpxDataItem gpxDataItem = view.getApplication().getGpxDatabase().getItem(new File(g.getGpxFile().path)); GpxDataItem gpxDataItem = null;
if (!g.isShowCurrentTrack()) {
gpxDataItem = view.getApplication().getGpxDatabase().getItem(new File(g.getGpxFile().path));
}
List<TrkSegment> segments = g.getPointsToDisplay(); List<TrkSegment> segments = g.getPointsToDisplay();
for (TrkSegment ts : segments) { for (TrkSegment ts : segments) {
int color = gpxDataItem.getColor(); int color = gpxDataItem != null ? gpxDataItem.getColor() : 0;
if (color == 0) { if (color == 0) {
color = ts.getColor(cachedColor); color = ts.getColor(cachedColor);
} }