From 1f0ca9ed92bf081e4bf6604293df38c311d74d6b Mon Sep 17 00:00:00 2001 From: Jitter <64605731+jitterdev@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:34:11 -0500 Subject: [PATCH 1/6] Update README.md Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com> --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index dbcf809ca..72599cd89 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. -We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/hX4g537UNE). Logo and branding also coming soon. +We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher). Logo and branding are also coming soon. ## Installation @@ -17,7 +17,7 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS. ## Help & Support -- Join the [Discord Server](https://discord.gg/hX4g537UNE) for now. +- Join the [Discord Server](https://discord.gg/prismlauncher) for now. ## License From 6befd2be81152049bff589bad798140332aa50ef Mon Sep 17 00:00:00 2001 From: Jitter <64605731+jitterdev@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:34:27 -0500 Subject: [PATCH 2/6] Update README.md Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 72599cd89..b35e2a019 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. -We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher). Logo and branding are also coming soon. +We are working on a website and other media, for more info we have a [Discord Server](https://discord.gg/prismlauncher). Logo and branding are also coming soon. ## Installation From 54281e53a1c9ce89827c649fb429062f38aa359e Mon Sep 17 00:00:00 2001 From: Jitter <64605731+jitterdev@users.noreply.github.com> Date: Tue, 18 Oct 2022 10:35:00 -0500 Subject: [PATCH 3/6] Update README.md Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b35e2a019..a7b09f26a 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ We are working on a website and other media, for more info we have a [Discord Se ## Installation - All downloads and instructions for Prism Launcher will soon be available. -- Last build status: +- Last build status can be found [here](https://github.com/PrismLauncher/PrismLauncher/actions). ### Development Builds From aec3e7b0fc840a4daec6ed7661f862f4d4495410 Mon Sep 17 00:00:00 2001 From: Jitter <64605731+jitterdev@users.noreply.github.com> Date: Tue, 18 Oct 2022 11:14:27 -0500 Subject: [PATCH 4/6] correct non-proper noun Signed-off-by: Jitter <64605731+jitterdev@users.noreply.github.com> --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a7b09f26a..046473b8e 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. -We are working on a website and other media, for more info we have a [Discord Server](https://discord.gg/prismlauncher). Logo and branding are also coming soon. +We are working on a website and other media, for more info we have a [Discord server](https://discord.gg/prismlauncher). Logo and branding are also coming soon. ## Installation @@ -17,7 +17,7 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS. ## Help & Support -- Join the [Discord Server](https://discord.gg/prismlauncher) for now. +- Join the [Discord server](https://discord.gg/prismlauncher) for now. ## License From 3a95a3b7c18519943b6f6d13f43710f708553db3 Mon Sep 17 00:00:00 2001 From: flow Date: Tue, 18 Oct 2022 16:51:42 -0300 Subject: [PATCH 5/6] fix: don't take item from a possibly empty list The list gets destroyed when we take the last object, so things explode. :pensive: Signed-off-by: flow --- launcher/settings/INISettingsObject.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/launcher/settings/INISettingsObject.cpp b/launcher/settings/INISettingsObject.cpp index 3677e2384..da962ee97 100644 --- a/launcher/settings/INISettingsObject.cpp +++ b/launcher/settings/INISettingsObject.cpp @@ -23,14 +23,16 @@ INISettingsObject::INISettingsObject(QStringList paths, QObject *parent) : SettingsObject(parent) { auto first_path = paths.constFirst(); - auto path = paths.takeFirst(); - while (!QFile::exists(path)) - path = paths.takeFirst(); + for (auto path : paths) { + if (!QFile::exists(path)) + continue; - if (path != first_path && QFile::exists(path)) { - // Copy the fallback to the preferred path. - QFile::copy(path, first_path); - qDebug() << "Copied settings from" << path << "to" << first_path; + if (path != first_path && QFile::exists(path)) { + // Copy the fallback to the preferred path. + QFile::copy(path, first_path); + qDebug() << "Copied settings from" << path << "to" << first_path; + break; + } } m_filePath = first_path; From 888a87463ee2a81632cc85d4225fbc0b8b984026 Mon Sep 17 00:00:00 2001 From: Fayne Aldan Date: Tue, 18 Oct 2022 14:40:34 -0600 Subject: [PATCH 6/6] Add fallback for multimc.cfg Signed-off-by: Fayne Aldan --- launcher/Application.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launcher/Application.cpp b/launcher/Application.cpp index b85729f07..d07ad99e7 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -489,7 +489,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) // Initialize application settings { // Provide a fallback for migration from PolyMC - m_settings.reset(new INISettingsObject({ BuildConfig.LAUNCHER_CONFIGFILE, "polymc.cfg" }, this)); + m_settings.reset(new INISettingsObject({ BuildConfig.LAUNCHER_CONFIGFILE, "polymc.cfg", "multimc.cfg" }, this)); // Updates // Multiple channels are separated by spaces m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL);