Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-25 17:32:10 +01:00
commit 1c275593cc

View file

@ -109,7 +109,9 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
@Override
public void updateLocation(Location location) {
showViewAngle = false;
locationProvider = location.getProvider();
if (location != null) {
locationProvider = location.getProvider();
}
if (mapView != null) {
RotatedTileBox tb = mapView.getCurrentRotatedTileBox();
if (isMapLinkedToLocation() && location != null) {