Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-04-28 11:01:02 +02:00
commit 3d32e4edbf

View file

@ -2336,7 +2336,7 @@ public class OsmandSettings {
public Set<String> getSelectedPoiFilters() { public Set<String> getSelectedPoiFilters() {
Set<String> result = new LinkedHashSet<>(); Set<String> result = new LinkedHashSet<>();
String filtersId = SELECTED_POI_FILTER_FOR_MAP.get(); String filtersId = SELECTED_POI_FILTER_FOR_MAP.get();
if (filtersId != null) { if (filtersId != null && !filtersId.isEmpty()) {
Collections.addAll(result, filtersId.split(",")); Collections.addAll(result, filtersId.split(","));
} }
return result; return result;