0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop

Browse Source 
Signed-off-by: Gideon9212 <gideon_gallagher@zoho.com>
This commit is contained in:
Gideon9212 2022-10-18 17:28:42 -07:00 committed by GitHub
commit 570264e1e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -2,12 +2,12 @@
Prism Launcher is a custom launcher for Minecraft that allows you to easily manage multiple installations of Minecraft at once. 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 ## Installation
- All downloads and instructions for Prism Launcher will soon be available. - 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 ### Development Builds
@ -17,7 +17,9 @@ Portable builds are provided for AppImage on Linux, Windows, and macOS.
## Help & Support ## Help & Support
[![Join the Discord Server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/hX4g537UNE)
[![Join the Discord Server](https://discordapp.com/api/guilds/1031648380885147709/widget.png?style=banner3)](https://discord.gg/prismlauncher)
## License ## License

2
launcher/Application.cpp
View File

@ -489,7 +489,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
// Initialize application settings // Initialize application settings
{ {
// Provide a fallback for migration from PolyMC // 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 // Updates
// Multiple channels are separated by spaces // Multiple channels are separated by spaces
m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL); m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL);

16
launcher/settings/INISettingsObject.cpp
View File

@ -23,14 +23,16 @@ INISettingsObject::INISettingsObject(QStringList paths, QObject *parent)
: SettingsObject(parent) : SettingsObject(parent)
{ {
auto first_path = paths.constFirst(); auto first_path = paths.constFirst();
auto path = paths.takeFirst(); for (auto path : paths) {
while (!QFile::exists(path)) if (!QFile::exists(path))
path = paths.takeFirst(); continue;
if (path != first_path && QFile::exists(path)) { if (path != first_path && QFile::exists(path)) {
// Copy the fallback to the preferred path. // Copy the fallback to the preferred path.
QFile::copy(path, first_path); QFile::copy(path, first_path);
qDebug() << "Copied settings from" << path << "to" << first_path; qDebug() << "Copied settings from" << path << "to" << first_path;
break;
}
} }
m_filePath = first_path; m_filePath = first_path;