summaryrefslogtreecommitdiffstats
path: root/MultiMC.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-01-05 16:53:51 +0100
committerPetr Mrázek <peterix@gmail.com>2014-01-05 16:53:51 +0100
commitced640f68c25c1ea40f86be5af736aa0263dd3ee (patch)
treebab0b570ba00204d2a9d9afcf69ce4cb36dd4afa /MultiMC.cpp
parenta64eebf8eb758971b090b2e87212c2458424797e (diff)
parentebc14a9d9d55b64d490ab07d3f11835f2f1f36b1 (diff)
downloadMultiMC-ced640f68c25c1ea40f86be5af736aa0263dd3ee.tar
MultiMC-ced640f68c25c1ea40f86be5af736aa0263dd3ee.tar.gz
MultiMC-ced640f68c25c1ea40f86be5af736aa0263dd3ee.tar.lz
MultiMC-ced640f68c25c1ea40f86be5af736aa0263dd3ee.tar.xz
MultiMC-ced640f68c25c1ea40f86be5af736aa0263dd3ee.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'MultiMC.cpp')
-rw-r--r--MultiMC.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp
index 2bc77e0f..a13ad794 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -346,8 +346,10 @@ void MultiMC::initGlobalSettings()
{
m_settings.reset(new INISettingsObject("multimc.cfg", this));
// Updates
- m_settings->registerSetting("UseDevBuilds", false);
+ m_settings->registerSetting("UpdateChannel", version().channel);
m_settings->registerSetting("AutoUpdate", true);
+
+ // Notifications
m_settings->registerSetting("ShownNotifications", QString());
// FTB