Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-05-25 08:57:39 +02:00
commit 38b0578577

View file

@ -1574,8 +1574,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin {
r.lon = geo.getLongitude(); r.lon = geo.getLongitude();
Float heading = app.getLocationProvider().getHeading(); Float heading = app.getLocationProvider().getHeading();
Location loc = app.getLocationProvider().getLastKnownLocation(); Location loc = app.getLocationProvider().getLastKnownLocation();
if (lastTakingPhoto != null && lastTakingPhoto.getName().equals(f.getName()) && heading != null) { if (lastTakingPhoto != null && lastTakingPhoto.getName().equals(f.getName())) {
float rot = heading.floatValue(); float rot = heading != null ? heading : 0;
try { try {
r.updatePhotoInformation(r.lat, r.lon, loc, rot == 0 ? Double.NaN : rot); r.updatePhotoInformation(r.lat, r.lon, loc, rot == 0 ? Double.NaN : rot);
} catch (IOException e) { } catch (IOException e) {