diff options
author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-12 01:00:26 -0700 |
---|---|---|
committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-12 01:00:26 -0700 |
commit | 82287e0407318724c5a460340eef2855c75449e8 (patch) | |
tree | f083d018d24ce86a02cc8d1edce9b56ef0f4f93d /launcher/Application.cpp | |
parent | a3173b53717fcea686f267f4eb8fd9788e6677db (diff) | |
parent | c5aff7cc1ef43a1326bd3ce0c83e29669e2ff43f (diff) | |
download | PrismLauncher-82287e0407318724c5a460340eef2855c75449e8.tar.gz PrismLauncher-82287e0407318724c5a460340eef2855c75449e8.tar.bz2 PrismLauncher-82287e0407318724c5a460340eef2855c75449e8.zip |
Merge branch 'develop' into curseforge-url-handle
Diffstat (limited to 'launcher/Application.cpp')
-rw-r--r-- | launcher/Application.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index c97fdb0a..5694b82e 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -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); |