From 6f60265c74c0c3b299f76e8fddae6efc99f0515a Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 2 Oct 2025 15:34:23 +0200 Subject: [PATCH] Only use DEFAULT_INSTALL_DIR, not DEFAULT_INI_DIR. --- common/src/utils_internal.cpp | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/common/src/utils_internal.cpp b/common/src/utils_internal.cpp index 9b7dc67..ecf21d1 100644 --- a/common/src/utils_internal.cpp +++ b/common/src/utils_internal.cpp @@ -62,7 +62,7 @@ QString branchName() { } std::unique_ptr readSettings(QString const &optionalDirName) { - std::unique_ptr settings{std::make_unique()}; + std::unique_ptr settings; //QString const fileName{settings->applicationName() + ".ini"}; QString const fileName{"ATBUpdateTool.ini"}; @@ -71,33 +71,17 @@ std::unique_ptr 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};