Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d37c5646f0
4 changed files with 12 additions and 2 deletions
ScStwLibraries
|
@ -133,6 +133,7 @@ public:
|
|||
InternalErrorTimerOperationFailed = 951,
|
||||
ApiVersionNotSupportedError = 952,
|
||||
CompetitionModeProhibitsThisError = 953,
|
||||
FirmwareUpdateFormatInvalidError = 954,
|
||||
TimersNotReadyError = 501 /*!< One or more timer is not ready */
|
||||
};
|
||||
Q_ENUM(ScStw::StatusCode)
|
||||
|
|
|
@ -50,6 +50,9 @@ ScStwClient::ScStwClient(QObject * parent, QList<ScStw::SignalKey> signalSubscri
|
|||
|
||||
void ScStwClient::connectToHost() {
|
||||
|
||||
if(this->state != DISCONNECTED)
|
||||
return;
|
||||
|
||||
setState(CONNECTING);
|
||||
|
||||
//connect
|
||||
|
|
|
@ -269,6 +269,7 @@ bool ScStwRace::playSoundsAndStartTimers() {
|
|||
}
|
||||
else {
|
||||
this->startDelayTimer->stop();
|
||||
this->startDelayTimer->setInterval(minimumReadyDelay);
|
||||
this->startDelayTimer->start();
|
||||
timerTriggered = true;
|
||||
}
|
||||
|
|
|
@ -280,11 +280,16 @@ QString ScStwTimer::getText() {
|
|||
}
|
||||
|
||||
void ScStwTimer::setDisabled(bool disabled) {
|
||||
if(this->isDisabled() == disabled)
|
||||
return;
|
||||
|
||||
if(disabled)
|
||||
this->setState(DISABLED);
|
||||
else {
|
||||
else
|
||||
this->setState(IDLE);
|
||||
}
|
||||
|
||||
emit this->readyStateChanged(this->getReadyState());
|
||||
|
||||
}
|
||||
|
||||
void ScStwTimer::setWantsToBeDisabled(bool wantsToBeDisabled) {
|
||||
|
|
Reference in a new issue