Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-07-15 20:16:50 +02:00
commit dc2e632193

View file

@ -220,9 +220,9 @@ public class VoiceRouter {
p.offRoute(dist).play();
}
if(waitAnnouncedOffRoute == 0) {
waitAnnouncedOffRoute = 30000;
waitAnnouncedOffRoute = 60000;
} else {
waitAnnouncedOffRoute += 30000;
waitAnnouncedOffRoute *= 2.5;
}
lastAnnouncedOffRoute = ms;
}