Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-09-09 21:23:16 +02:00
commit af93ab7f37

View file

@ -246,7 +246,7 @@ public class WaypointHelper {
if (pointTypes != null) { if (pointTypes != null) {
for (int r = 0; r < pointTypes.length; r++) { for (int r = 0; r < pointTypes.length; r++) {
RouteTypeRule typeRule = reg.quickGetEncodingRule(pointTypes[r]); RouteTypeRule typeRule = reg.quickGetEncodingRule(pointTypes[r]);
AlarmInfo info = AlarmInfo.createAlarmInfo(typeRule, 0, loc); AlarmInfo info = AlarmInfo.createAlarmInfo(typeRule, i, loc);
if (info != null) { if (info != null) {
if (info.getType() != AlarmInfoType.SPEED_CAMERA || showCameras) { if (info.getType() != AlarmInfoType.SPEED_CAMERA || showCameras) {
long ms = System.currentTimeMillis() ; long ms = System.currentTimeMillis() ;