Merge pull request #88 from FayneAldan/multimc-fallback
go all the way up the fork chain!
This commit is contained in:
commit
325e58d98c
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user