Merge branch 'develop' of https://github.com/PolyMC/PolyMC into flatpak_properly

2022-03-28 20:55:06 +02:00
parent 3a7eeff135 87cf38a377
commit 341eb16a4c
33 changed files with 1083 additions and 1428 deletions
--- a/launcher/Application.cpp
+++ b/launcher/Application.cpp
@ -727,6 +727,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv)
        m_settings->registerSetting("PastebinURL", "https://0x0.st");

        m_settings->registerSetting("CloseAfterLaunch", false);
+        m_settings->registerSetting("QuitAfterGameStop", false);

        // Custom MSA credentials
        m_settings->registerSetting("MSAClientIDOverride", "");