diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-05 16:53:51 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-05 16:53:51 +0100 |
| commit | ced640f68c25c1ea40f86be5af736aa0263dd3ee (patch) | |
| tree | bab0b570ba00204d2a9d9afcf69ce4cb36dd4afa /logic | |
| parent | a64eebf8eb758971b090b2e87212c2458424797e (diff) | |
| parent | ebc14a9d9d55b64d490ab07d3f11835f2f1f36b1 (diff) | |
| download | MultiMC-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 'logic')
| -rw-r--r-- | logic/updater/UpdateChecker.cpp | 7 | ||||
| -rw-r--r-- | logic/updater/UpdateChecker.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/logic/updater/UpdateChecker.cpp b/logic/updater/UpdateChecker.cpp index 9af11cab..489e7769 100644 --- a/logic/updater/UpdateChecker.cpp +++ b/logic/updater/UpdateChecker.cpp @@ -23,6 +23,8 @@ #include <QJsonArray> #include <QJsonValue> +#include <settingsobject.h> + #define API_VERSION 0 #define CHANLIST_FORMAT 0 @@ -69,9 +71,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; |