Skip to content

Commit

Permalink
Merge pull request #88 from FayneAldan/multimc-fallback
Browse files Browse the repository at this point in the history
go all the way up the fork chain!
  • Loading branch information
flowln committed Oct 18, 2022
2 parents 23a2960 + 888a874 commit 325e58d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion launcher/Application.cpp
Expand Up @@ -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);
Expand Down

0 comments on commit 325e58d

Please sign in to comment.