Compare commits
No commits in common. "22e751e1977e3a0e66759aef084d19cc02625c41" and "e5ab9b98cd0d55deb5ce7c2b4df8723f1864a896" have entirely different histories.
22e751e197
...
e5ab9b98cd
@ -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.
|
||||
|
@ -130,10 +130,8 @@ 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);
|
||||
}
|
||||
}
|
||||
|
||||
// before loading the library, delete all possible shared memory segments
|
||||
#if defined Q_OS_LINUX || defined Q_OS_UNIX
|
||||
|
@ -170,8 +170,6 @@ Worker::Worker(int customerNr,
|
||||
// TODO: turn object into singleton
|
||||
instance = this;
|
||||
m_lastFailedUpdateStep = UPDATE_STEP::NONE;
|
||||
|
||||
if (m_noUpdatePsaHardware == false) {
|
||||
m_update = new Update(this,
|
||||
QDir::cleanPath(m_workingDirectory + QDir::separator() + m_customerNrStr),
|
||||
m_customerNrStr,
|
||||
@ -179,7 +177,6 @@ Worker::Worker(int customerNr,
|
||||
m_pluginDir,
|
||||
m_pluginName,
|
||||
m_workingDirectory);
|
||||
}
|
||||
|
||||
this->setObjectName("worker-object");
|
||||
QDir::setCurrent(m_workingDirectory);
|
||||
|
Loading…
x
Reference in New Issue
Block a user