Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-01 19:04:56 +02:00
commit 567bea9a1f

View file

@ -1495,7 +1495,11 @@ public class OsmandSettings {
public PointDescription getAndClearMapLabelToShow(LatLon l) { public PointDescription getAndClearMapLabelToShow(LatLon l) {
String label = settingsAPI.getString(globalPreferences, MAP_LABEL_TO_SHOW, null); String label = settingsAPI.getString(globalPreferences, MAP_LABEL_TO_SHOW, null);
settingsAPI.edit(globalPreferences).remove(MAP_LABEL_TO_SHOW).commit(); settingsAPI.edit(globalPreferences).remove(MAP_LABEL_TO_SHOW).commit();
if (label != null) {
return PointDescription.deserializeFromString(label, l); return PointDescription.deserializeFromString(label, l);
} else {
return null;
}
} }
private Object objectToShow; private Object objectToShow;