Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-09-22 21:14:37 +02:00
commit 218d79dcd2

View file

@ -500,9 +500,12 @@ public class VoiceRouter {
if(isTargetPoint(nextInfo) && (!playedAndArriveAtTarget || repeat)) { if(isTargetPoint(nextInfo) && (!playedAndArriveAtTarget || repeat)) {
if(next.getTurnType().goAhead()) { if(next.getTurnType().goAhead()) {
playGoAhead(nextInfo.distanceTo, getSpeakableStreetName(currentSegment, next)); playGoAhead(nextInfo.distanceTo, getSpeakableStreetName(currentSegment, next));
}
andSpeakArriveAtPoint(nextInfo); andSpeakArriveAtPoint(nextInfo);
playedAndArriveAtTarget = true; playedAndArriveAtTarget = true;
} else if(nextInfo.distanceTo <= 2 * TURN_IN_DISTANCE) {
andSpeakArriveAtPoint(nextInfo);
playedAndArriveAtTarget = true;
}
} }
} }