Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-07-03 18:32:32 +02:00
commit bc5444a7c3

View file

@ -186,7 +186,7 @@ public class VoiceRouter {
btScoDelayDistance = currentSpeed * (double) AbstractPrologCommandPlayer.BT_SCO_DELAY / 1000; btScoDelayDistance = currentSpeed * (double) AbstractPrologCommandPlayer.BT_SCO_DELAY / 1000;
} }
if((dist < etalon + btScoDelayDistance) || ((dist / currentSpeed) < ((etalon + btScoDelayDistance) / defSpeed))){ if((dist < etalon + btScoDelayDistance) || ((dist - btScoDelayDistance) / currentSpeed) < (etalon / defSpeed))){
return true; return true;
} }
return false; return false;