Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-09-10 12:22:35 +02:00
commit de70aec8d3

View file

@ -335,7 +335,7 @@ public class WaypointHelper {
} else if (type == POI) { } else if (type == POI) {
getVoiceRouter().approachPoi(lastKnownLocation, approachPoints); getVoiceRouter().approachPoi(lastKnownLocation, approachPoints);
} else if (type == ALARMS) { } else if (type == ALARMS) {
EnumSet<AlarmInfoType> ait = EnumSet.noneOf(AlarmInfoType.class); EnumSet<AlarmInfoType> ait = EnumSet.allOf(AlarmInfoType.class);
for(LocationPointWrapper pw : announcePoints) { for(LocationPointWrapper pw : announcePoints) {
ait.add(((AlarmInfo) pw.point).getType()); ait.add(((AlarmInfo) pw.point).getType());
} }