Merge branch 'develop' into curseforge-url-handle

This commit is contained in:
Rachel Powers 2023-05-12 01:00:26 -07:00
commit 82287e0407
64 changed files with 3693 additions and 581 deletions

View file

@ -425,16 +425,16 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
foundLoggingRules = QFile::exists(logRulesPath);
// search the dataPath()
// seach app data standard path
if(!foundLoggingRules && !isPortable() && dirParam.isEmpty()) {
logRulesPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, logRulesFile);
logRulesPath = QStandardPaths::locate(QStandardPaths::AppDataLocation, FS::PathCombine("..", logRulesFile));
if(!logRulesPath.isEmpty()) {
qDebug() << "Found" << logRulesPath << "...";
foundLoggingRules = true;
}
}
if(!QFile::exists(logRulesPath)) {
// seach root path
if(!foundLoggingRules) {
logRulesPath = FS::PathCombine(m_rootPath, logRulesFile);
qDebug() << "Testing" << logRulesPath << "...";
foundLoggingRules = QFile::exists(logRulesPath);