Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
6f7c7ece46
1 changed files with 1 additions and 1 deletions
|
@ -442,9 +442,9 @@ public class VoiceRouter {
|
||||||
// do not play prepare for keep left/right
|
// do not play prepare for keep left/right
|
||||||
} else {
|
} else {
|
||||||
playPrepareTurn(currentSegment, next, dist);
|
playPrepareTurn(currentSegment, next, dist);
|
||||||
}
|
|
||||||
playAndArriveAtDestination(repeat, nextInfo, currentSegment);
|
playAndArriveAtDestination(repeat, nextInfo, currentSegment);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
nextStatusAfter(STATUS_PREPARE);
|
nextStatusAfter(STATUS_PREPARE);
|
||||||
// } else if (statusNotPassed(STATUS_LONG_PREPARE) && isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE)){
|
// } else if (statusNotPassed(STATUS_LONG_PREPARE) && isDistanceLess(speed, dist, PREPARE_LONG_DISTANCE)){
|
||||||
} else if ((repeat || statusNotPassed(STATUS_LONG_PREPARE)) && (dist <= PREPARE_LONG_DISTANCE)) {
|
} else if ((repeat || statusNotPassed(STATUS_LONG_PREPARE)) && (dist <= PREPARE_LONG_DISTANCE)) {
|
||||||
|
|
Loading…
Reference in a new issue