Commit a5328257 authored by Karel Slaný's avatar Karel Slaný

Merge branch 'fixed-rec-mng-settings' into 'develop'

Fixed load of records management settings

See merge request !136
parents f7fd19bc b64ca298
...@@ -326,6 +326,15 @@ int main(int argc, char *argv[]) ...@@ -326,6 +326,15 @@ int main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
/* Create and init global records management settings. */
GlobInstcs::recMgmtSetPtr =
new (std::nothrow) RecordsManagementSettings;
if (GlobInstcs::recMgmtSetPtr == Q_NULLPTR) {
logErrorNL("%s",
"Cannot create records management settings.");
return EXIT_FAILURE;
}
/* Load application settings from storage. */ /* Load application settings from storage. */
QSettings settings(Settings::settingsPath(), QSettings settings(Settings::settingsPath(),
QSettings::IniFormat); QSettings::IniFormat);
...@@ -379,14 +388,6 @@ int main(int argc, char *argv[]) ...@@ -379,14 +388,6 @@ int main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
GlobInstcs::recMgmtSetPtr =
new (std::nothrow) RecordsManagementSettings;
if (GlobInstcs::recMgmtSetPtr == Q_NULLPTR) {
logErrorNL("%s",
"Cannot create records management settings.");
return EXIT_FAILURE;
}
GlobInstcs::recMgmtDbPtr = new (std::nothrow) GlobInstcs::recMgmtDbPtr = new (std::nothrow)
RecordsManagementDb("recordsManagementDb", false); RecordsManagementDb("recordsManagementDb", false);
if (GlobInstcs::recMgmtDbPtr == Q_NULLPTR) { if (GlobInstcs::recMgmtDbPtr == Q_NULLPTR) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment