diff options
| -rw-r--r-- | launcher/Application.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 24273014..e94e96a9 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 |