Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-02-28 01:02:04 +01:00
commit 664fffa2e8

View file

@ -255,6 +255,11 @@ public class MapMarkersHelper {
public void removeActiveMarkers() { public void removeActiveMarkers() {
cancelAddressRequests(); cancelAddressRequests();
List<MapMarker> markers = new ArrayList<>(mapMarkers.size());
for (int i = 0, i<= mapMarkers.size() - 1; i++) {
MapMarker marker = mapMarkers.get(i);
addMapMarkerHistory(marker);
}
settings.clearActiveMapMarkers(); settings.clearActiveMapMarkers();
readFromSettings(); readFromSettings();
refresh(); refresh();