diff options
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | launcher/Application.cpp | 2 | ||||
| -rw-r--r-- | launcher/settings/INISettingsObject.cpp | 16 |
3 files changed, 15 insertions, 11 deletions
@@ -2,12 +2,12 @@ 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 - All downloads and instructions for Prism Launcher will soon be available. -- Last build status: <https://github.com/PrismLauncher/PrismLauncher/actions> +- Last build status can be found [here](https://github.com/PrismLauncher/PrismLauncher/actions). ### Development Builds @@ -17,7 +17,9 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS. ## Help & Support -[](https://discord.gg/hX4g537UNE) + +[](https://discord.gg/prismlauncher) + ## License diff --git a/launcher/Application.cpp b/launcher/Application.cpp index b85729f0..d07ad99e 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); diff --git a/launcher/settings/INISettingsObject.cpp b/launcher/settings/INISettingsObject.cpp index 3677e238..da962ee9 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; |