Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-07-01 19:04:56 +02:00
commit 567bea9a1f
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd/src/net/osmand/plus/OsmandSettings.java
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();
return PointDescription.deserializeFromString(label, l); if (label != null) {
return PointDescription.deserializeFromString(label, l);
} else {
return null;
}
} }
private Object objectToShow; private Object objectToShow;