Merge remote-tracking branch 'origin/master'

ScStwLibraries/headers/ScStw.hpp

@@ -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)

ScStwLibraries/sources/client/scstwclient.cpp

@@ -50,6 +50,9 @@ ScStwClient::ScStwClient(QObject * parent, QList<ScStw::SignalKey> signalSubscri
 
 void ScStwClient::connectToHost() {
 
+    if(this->state != DISCONNECTED)
+        return;
+
     setState(CONNECTING);
 
     //connect

ScStwLibraries/sources/scstwrace.cpp

@@ -269,6 +269,7 @@ bool ScStwRace::playSoundsAndStartTimers() {
             }
             else {
                 this->startDelayTimer->stop();
+                this->startDelayTimer->setInterval(minimumReadyDelay);
                 this->startDelayTimer->start();
                 timerTriggered = true;
             }

ScStwLibraries/sources/scstwtimer.cpp

@@ -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) {