diff options
| author | DioEgizio <83089242+DioEgizio@users.noreply.github.com> | 2022-10-18 19:50:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-18 19:50:34 +0200 |
| commit | fb4cf0b75d6d72b8f35317fb5c82e668f5cdfafe (patch) | |
| tree | cc024d4f3a0cd812af4194804e4b76d6f07b889a /launcher/Application.cpp | |
| parent | 5584884fe652209073dad27a0a7ac46e5b9a85f3 (diff) | |
| parent | 32cdfb871c5cb0008cd34b5d5c1ff133920382d9 (diff) | |
| download | PrismLauncher-fb4cf0b75d6d72b8f35317fb5c82e668f5cdfafe.tar.gz PrismLauncher-fb4cf0b75d6d72b8f35317fb5c82e668f5cdfafe.tar.bz2 PrismLauncher-fb4cf0b75d6d72b8f35317fb5c82e668f5cdfafe.zip | |
Merge pull request #55 from flowln/config_add_fallback
Diffstat (limited to 'launcher/Application.cpp')
| -rw-r--r-- | launcher/Application.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index e94e96a9..b85729f0 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -488,7 +488,8 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv) // Initialize application settings { - m_settings.reset(new INISettingsObject(BuildConfig.LAUNCHER_CONFIGFILE, this)); + // Provide a fallback for migration from PolyMC + m_settings.reset(new INISettingsObject({ BuildConfig.LAUNCHER_CONFIGFILE, "polymc.cfg" }, this)); // Updates // Multiple channels are separated by spaces m_settings->registerSetting("UpdateChannel", BuildConfig.VERSION_CHANNEL); |