Compare commits
3 Commits
e5ab9b98cd
...
22e751e197
Author | SHA1 | Date | |
---|---|---|---|
22e751e197 | |||
05c7d11ef8 | |||
63dc70dda9 |
@ -121,6 +121,8 @@ 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,8 +130,10 @@ 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,6 +170,8 @@ 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,
|
||||
@ -177,6 +179,7 @@ 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