diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2023-08-02 19:27:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-02 19:27:48 +0200 |
| commit | fa2b784f7eb817e97d0af45fe78d205932ada193 (patch) | |
| tree | f263bdc3fd2f945e6ecc75f9b59b55d009082cca /launcher/Application.cpp | |
| parent | b1aa9e584624a0732dd55fc6c459524a8abfe6ba (diff) | |
| parent | 01e17806f67534140a6db6cf90191f4db4dd30ac (diff) | |
| download | PrismLauncher-fa2b784f7eb817e97d0af45fe78d205932ada193.tar.gz PrismLauncher-fa2b784f7eb817e97d0af45fe78d205932ada193.tar.bz2 PrismLauncher-fa2b784f7eb817e97d0af45fe78d205932ada193.zip | |
Merge branch 'develop' into sparkle-disable
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
Diffstat (limited to 'launcher/Application.cpp')
| -rw-r--r-- | launcher/Application.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index 27a8756d..7bfcce5f 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -281,7 +281,16 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) } else { - QDir foo(FS::PathCombine(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), "..")); + QDir foo; + if (DesktopServices::isSnap()) + { + foo = QDir(getenv("SNAP_USER_COMMON")); + } + else + { + foo = QDir(FS::PathCombine(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation), "..")); + } + dataPath = foo.absolutePath(); adjustedBy = "Persistent data path"; @@ -628,9 +637,6 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) m_settings->registerSetting("ShowGlobalGameTime", true); m_settings->registerSetting("RecordGameTime", true); - // Minecraft launch method - m_settings->registerSetting("MCLaunchMethod", "LauncherPart"); - // Minecraft mods m_settings->registerSetting("ModMetadataDisabled", false); @@ -704,7 +710,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) QUrl metaUrl(m_settings->get("MetaURLOverride").toString()); // get rid of invalid meta urls - if (!metaUrl.isValid() || metaUrl.scheme() != "http" || metaUrl.scheme() != "https") + if (!metaUrl.isValid() || (metaUrl.scheme() != "http" && metaUrl.scheme() != "https")) m_settings->reset("MetaURLOverride"); } |