UpdatePTUDevCtrl/UpdatePTUDevCtrl.pro

@@ -121,8 +121,6 @@ DEFINES += QT_DEPRECATED_WARNINGS
 #           when pulling new branch, but branch already existed locally.
 # 1.4.6   : No exit()-call if loading CA-plugin fails.
 #           Check m_hw (pointer to CA-(Slave)Plugin) before its use.
-#           Only exit() if firmware is configured to be possibly updated, but
-#           loading the CA-plugin failed.
 VERSION="1.4.7"
 # PLANNED TODOS:
 #   1:  Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.

UpdatePTUDevCtrl/main.cpp

@@ -130,9 +130,7 @@ int main(int argc, char *argv[]) {
     if (!QDir(plugInDir).exists()) {
         qCritical() << plugInDir
                     << "does not exists, but has to contain dc-library";
-        if (noUpdatePsaHardware == false) {
+        exit(-1);
-            exit(-1);
-        }
     }
 
     // before loading the library, delete all possible shared memory segments

UpdatePTUDevCtrl/worker.cpp

@@ -170,16 +170,13 @@ Worker::Worker(int customerNr,
     // TODO: turn object into singleton
     instance = this;
     m_lastFailedUpdateStep = UPDATE_STEP::NONE;
-
+    m_update = new Update(this,
-    if (m_noUpdatePsaHardware == false) {
+                          QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
-        m_update = new Update(this,
+                          m_customerNrStr,
-                              QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
+                          m_branchName,
-                              m_customerNrStr,
+                          m_pluginDir,
-                              m_branchName,
+                          m_pluginName,
-                              m_pluginDir,
+                          m_workingDirectory);
-                              m_pluginName,
-                              m_workingDirectory);
-    }
 
     this->setObjectName("worker-object");
     QDir::setCurrent(m_workingDirectory);