Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-09-05 11:49:32 +02:00
commit 43eedeba0d

View file

@ -436,7 +436,7 @@ public class VoiceRouter {
if (currentStatus == STATUS_UNKNOWN) {
// Tell goAhead distance after (1) route calculation if no other prompt is due, or (2) after a turn if next turn is more than PREPARE_LONG_DISTANCE away
//if (!isDistanceLess(speed, dist, TURN_IN_DISTANCE * 1.3, 0f)) {
if (playGoAheadDist == -1 || !isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE + 300, 0f)) {
if ((playGoAheadDist = -1 && !isDistanceLess(speed, dist, TURN_IN_DISTANCE * 1.3, 0f)) || !isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE + 300, 0f)) {
playGoAheadDist = dist - 80;
}
// Put voice router in appropriate status