Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-07-24 15:20:13 +02:00
commit 17d8f70da7

View file

@ -339,8 +339,8 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc
OsmAndLocationProvider locationProvider = app.getLocationProvider(); OsmAndLocationProvider locationProvider = app.getLocationProvider();
if (!isMapLinkedToLocation()) { if (!isMapLinkedToLocation()) {
setMapLinkedToLocation(true); setMapLinkedToLocation(true);
if (locationProvider.getLastKnownLocation() != null) { net.osmand.Location lastKnownLocation = locationProvider.getLastKnownLocation();
net.osmand.Location lastKnownLocation = locationProvider.getLastKnownLocation(); if (lastKnownLocation != null) {
AnimateDraggingMapThread thread = mapView.getAnimatedDraggingThread(); AnimateDraggingMapThread thread = mapView.getAnimatedDraggingThread();
int fZoom = mapView.getZoom() < zoom ? zoom : mapView.getZoom(); int fZoom = mapView.getZoom() < zoom ? zoom : mapView.getZoom();
movingToMyLocation = true; movingToMyLocation = true;