Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-02-24 21:24:27 +01:00
commit d8a66d19a8

View file

@ -354,6 +354,9 @@ public class GpxImportHelper {
for (GPXUtilities.WptPt p : wptPts) { for (GPXUtilities.WptPt p : wptPts) {
if (p.category != null) { if (p.category != null) {
final FavouritePoint fp = new FavouritePoint(p.lat, p.lon, p.name, p.category); final FavouritePoint fp = new FavouritePoint(p.lat, p.lon, p.name, p.category);
if (p.desc!=null) {
fp.setDescription(p.desc);
}
favourites.add(fp); favourites.add(fp);
} else if (p.name != null) { } else if (p.name != null) {
int c; int c;