Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dorian Zedler 2020-10-11 15:46:11 +02:00
commit 35fb805849
Signed by: dorian
GPG key ID: D3B255CB8BC7CD37

View file

@ -114,6 +114,11 @@ ScStw::StatusCode ScStwRace::reset() {
qDebug() << "[INFO][RACE] resetting race"; qDebug() << "[INFO][RACE] resetting race";
if(this->competitionMode) {
for(int i = 0; i < this->timers.length(); i++)
this->setTimerDisabled(i, false);
}
ScStw::StatusCode returnCode = ScStw::Success; ScStw::StatusCode returnCode = ScStw::Success;
foreach(ScStwTimer *timer, this->timers){ foreach(ScStwTimer *timer, this->timers){
@ -186,6 +191,8 @@ ScStw::StatusCode ScStwRace::setTimerDisabled(ScStwTimer* timer, bool disabled)
timer->setDisabled(disabled); timer->setDisabled(disabled);
emit this->timersChanged();
return ScStw::Success; return ScStw::Success;
} }