Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
567bea9a1f
1 changed files with 5 additions and 1 deletions
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue