diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-20 01:32:38 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-20 01:32:38 +0100 |
| commit | 222d3c0dc5a8b8a9e93b9368e964cda7becc7f02 (patch) | |
| tree | 9ab4538f2e80847874a7c9a5c7c2dbc099cb8cae /logic/updater | |
| parent | 48b587e7b6b96b5c3ac17dc8b67a7b0ab9c2c4f0 (diff) | |
| parent | 3a3c9ac9515447941d383f2c4fe4b0225fdd8252 (diff) | |
| download | PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.gz PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.tar.bz2 PrismLauncher-222d3c0dc5a8b8a9e93b9368e964cda7becc7f02.zip | |
Merge branch 'release-0.2'
Diffstat (limited to 'logic/updater')
| -rw-r--r-- | logic/updater/NotificationChecker.cpp | 2 | ||||
| -rw-r--r-- | logic/updater/UpdateChecker.cpp | 1 | ||||
| -rw-r--r-- | logic/updater/UpdateChecker.h | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/logic/updater/NotificationChecker.cpp b/logic/updater/NotificationChecker.cpp index b2d67632..191e90a3 100644 --- a/logic/updater/NotificationChecker.cpp +++ b/logic/updater/NotificationChecker.cpp @@ -55,7 +55,7 @@ void NotificationChecker::downloadSucceeded(int) { m_entries.clear(); - QFile file(m_download->m_output_file.fileName()); + QFile file(m_download->getTargetFilepath()); if (file.open(QFile::ReadOnly)) { QJsonArray root = QJsonDocument::fromJson(file.readAll()).array(); diff --git a/logic/updater/UpdateChecker.cpp b/logic/updater/UpdateChecker.cpp index 8a280dd1..8e2aa8b3 100644 --- a/logic/updater/UpdateChecker.cpp +++ b/logic/updater/UpdateChecker.cpp @@ -30,7 +30,6 @@ UpdateChecker::UpdateChecker() { - m_currentChannel = VERSION_CHANNEL; m_channelListUrl = CHANLIST_URL; m_updateChecking = false; m_chanListLoading = false; diff --git a/logic/updater/UpdateChecker.h b/logic/updater/UpdateChecker.h index 7840cedc..3b0ee28d 100644 --- a/logic/updater/UpdateChecker.h +++ b/logic/updater/UpdateChecker.h @@ -27,7 +27,6 @@ public: UpdateChecker(); void checkForUpdate(bool notifyNoUpdate); - void setCurrentChannel(const QString &channel) { m_currentChannel = channel; } void setChannelListUrl(const QString &url) { m_channelListUrl = url; } /*! @@ -83,7 +82,6 @@ private: QString m_repoUrl; QString m_channelListUrl; - QString m_currentChannel; QList<ChannelListEntry> m_channels; |