Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-19 00:49:06 +02:00
commit bceefba053

View file

@ -799,7 +799,11 @@ public class VoiceRouter {
CommandBuilder play = getNewCommandPlayerToPlay(); CommandBuilder play = getNewCommandPlayerToPlay();
if (play != null) { if (play != null) {
notifyOnVoiceMessage(); notifyOnVoiceMessage();
play.routeRecalculated(router.getLeftDistance(), router.getLeftTime()).play(); if (!newRoute) {
play.routeRecalculated(router.getLeftDistance(), router.getLeftTime()).play();
} else {
play.newRouteCalculated(router.getLeftDistance(), router.getLeftTime()).play();
}
} else if (player == null) { } else if (player == null) {
pendingCommand = new VoiceCommandPending(!newRoute ? VoiceCommandPending.ROUTE_RECALCULATED : VoiceCommandPending.ROUTE_CALCULATED, this); pendingCommand = new VoiceCommandPending(!newRoute ? VoiceCommandPending.ROUTE_RECALCULATED : VoiceCommandPending.ROUTE_CALCULATED, this);
} }