From 6db3f68ae18098d96ef63cec5ffc666b6150304b Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Tue, 18 Oct 2022 13:54:05 +0200 Subject: [PATCH] refactor: use correct data path Signed-off-by: Sefa Eyeoglu --- launcher/Application.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 242730146..e94e96a9d 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -224,9 +224,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) consoleAttached = true; } #endif - setOrganizationName(BuildConfig.LAUNCHER_DISPLAYNAME); + setOrganizationName(BuildConfig.LAUNCHER_NAME); setOrganizationDomain(BuildConfig.LAUNCHER_DOMAIN); - setApplicationName(BuildConfig.LAUNCHER_DISPLAYNAME); + setApplicationName(BuildConfig.LAUNCHER_NAME); setApplicationDisplayName(QString("%1 %2").arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString())); setApplicationVersion(BuildConfig.printableVersionString()); setDesktopFileName(BuildConfig.LAUNCHER_DESKTOPFILENAME); @@ -301,6 +301,12 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) dataPath = foo.absolutePath(); adjustedBy = "Persistent data path"; + QDir polymcData(FS::PathCombine(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation), "PolyMC")); + if (polymcData.exists()) { + dataPath = polymcData.absolutePath(); + adjustedBy = "PolyMC data path"; + } + #ifdef Q_OS_LINUX // TODO: this should be removed in a future version // TODO: provide a migration path similar to macOS migration