Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dorian Zedler 2020-10-03 13:06:34 +02:00
commit e873503dfa
Signed by: dorian
GPG key ID: D3B255CB8BC7CD37

View file

@ -551,10 +551,11 @@ QVariantMap ScStwRace::getCurrentStartDelay() {
case WAITING:
if(!this->startSoundSettings[ScStwSoundPlayer::Ready]["Enabled"].toBool())
return currentStartDelay;
if(!this->getIsReadyForNextState())
if(!this->getIsReadyForNextState()) {
// indicate that we are waiting for climbers and the progress shall be zero
currentStartDelay["progress"] = -1;
return currentStartDelay;
currentStartDelay["progress"] = 0;
return currentStartDelay;
}
case PREPAIRING: {
if(!this->startSoundSettings[ScStwSoundPlayer::AtYourMarks]["Enabled"].toBool())
return currentStartDelay;