GerhardHoffmann/ATBUpdateTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only use DEFAULT_INSTALL_DIR, not DEFAULT_INI_DIR.

Browse Source
This commit is contained in:
Gerhard Hoffmann
2025-10-02 15:34:23 +02:00
parent 1c10d9bc14
commit 6f60265c74
1 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/src/utils_internal.cpp
View File

@@ -62,7 +62,7 @@ QString branchName() {
}
std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
std::unique_ptr<QSettings> settings{std::make_unique<QSettings>()};
std::unique_ptr<QSettings> settings;
//QString const fileName{settings->applicationName() + ".ini"};
QString const fileName{"ATBUpdateTool.ini"};
@@ -71,33 +71,17 @@ std::unique_ptr<QSettings> readSettings(QString const &optionalDirName) {
if (!optionalDirName.isEmpty()) {
d = QDir{optionalDirName};
if (d.exists()) { // try to find ini-file under optionalDirname
QFileInfo fi{d, optionalDirName};
QFileInfo fi{QDir::cleanPath(optionalDirName + QDir::separator() + fileName)};
if (fi.exists()) {
settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
return settings;
} else {
qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found."
<< "Try" << internal::DEFAULT_INI_DIR;
qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found.";
}
} else {
qCritical().noquote() << "read" << fileName << ":" << optionalDirName << "not found."
<< "Try" << internal::DEFAULT_INSTALL_DIR;
qCritical().noquote() << optionalDirName << "not found. Try" << internal::DEFAULT_INSTALL_DIR;
}
}
d = internal::DEFAULT_INI_DIR;
if (d.exists()) { // try to find ini-file under /etc/tools/atbupdate
QFileInfo fi{d, fileName};
if (fi.exists()) {
settings.reset(new QSettings(fi.absoluteFilePath(), QSettings::IniFormat));
return settings;
} else {
qCritical().noquote() << "read" << fileName << ":" << fi.absoluteFilePath() << "not found."
<< "Try" << internal::DEFAULT_INSTALL_DIR;
}
} else {
qCritical().noquote() << "read" << fileName << ":" << internal::DEFAULT_INI_DIR << "not found."
<< "Try" << internal::DEFAULT_INSTALL_DIR;
}
d = QDir{internal::DEFAULT_INSTALL_DIR};
if (d.exists()) { // try to find ini-file under /opt/app/tools/atbupdate
QFileInfo fi{d, fileName};