diff options
| author | flow <flowlnlnln@gmail.com> | 2022-10-18 19:27:24 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-18 19:27:24 -0300 |
| commit | 325e58d98c26fb802956de75e8ddfcfe0d9e3782 (patch) | |
| tree | 46a839a1d6d3e8127e05449fdaa92be5a5137789 /launcher | |
| parent | 23a2960aa3f779bf3b7d8c6865a2fdeafe77d87c (diff) | |
| parent | 888a87463ee2a81632cc85d4225fbc0b8b984026 (diff) | |
| download | PrismLauncher-325e58d98c26fb802956de75e8ddfcfe0d9e3782.tar.gz PrismLauncher-325e58d98c26fb802956de75e8ddfcfe0d9e3782.tar.bz2 PrismLauncher-325e58d98c26fb802956de75e8ddfcfe0d9e3782.zip | |
Merge pull request #88 from FayneAldan/multimc-fallback
go all the way up the fork chain!
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/Application.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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); |