summaryrefslogtreecommitdiffstats
path: root/logic/updater
diff options
context:
space:
mode:
authorForkk <forkk@forkk.net>2014-01-04 19:46:47 -0600
committerForkk <forkk@forkk.net>2014-01-04 19:46:47 -0600
commitd30962bf00b491f3cc23c505b6597c7618ddcd8c (patch)
treeaf3f06ea65447fb6a51deba68263690a9271ddb1 /logic/updater
parent116a6458b5ba35c87f6a22783d509a1fe8672f24 (diff)
downloadMultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.tar
MultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.tar.gz
MultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.tar.lz
MultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.tar.xz
MultiMC-d30962bf00b491f3cc23c505b6597c7618ddcd8c.zip
Implement changing update channels
Allow the user to select which update channel they would like to download updates from.
Diffstat (limited to 'logic/updater')
-rw-r--r--logic/updater/UpdateChecker.cpp7
-rw-r--r--logic/updater/UpdateChecker.h2
2 files changed, 5 insertions, 4 deletions
diff --git a/logic/updater/UpdateChecker.cpp b/logic/updater/UpdateChecker.cpp
index d0795c0d..acf74f40 100644
--- a/logic/updater/UpdateChecker.cpp
+++ b/logic/updater/UpdateChecker.cpp
@@ -24,6 +24,8 @@
#include <QJsonArray>
#include <QJsonValue>
+#include <settingsobject.h>
+
#define API_VERSION 0
#define CHANLIST_FORMAT 0
@@ -70,9 +72,8 @@ void UpdateChecker::checkForUpdate(bool notifyNoUpdate)
m_updateChecking = true;
- // Get the URL for the channel we're using.
- // TODO: Allow user to select channels. For now, we'll just use the current channel.
- QString updateChannel = m_currentChannel;
+ // Get the channel we're checking.
+ QString updateChannel = MMC->settings()->get("UpdateChannel").toString();
// Find the desired channel within the channel list and get its repo URL. If if cannot be
// found, error.
diff --git a/logic/updater/UpdateChecker.h b/logic/updater/UpdateChecker.h
index a47e8903..7840cedc 100644
--- a/logic/updater/UpdateChecker.h
+++ b/logic/updater/UpdateChecker.h
@@ -54,7 +54,7 @@ public:
QList<ChannelListEntry> getChannelList() const;
/*!
- * Returns true if the channel list is empty.
+ * Returns false if the channel list is empty.
*/
bool hasChannels() const;