diff options
| author | Petr Mrázek <peterix@gmail.com> | 2017-03-19 23:58:54 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2017-04-07 00:20:02 +0200 |
| commit | f557c1367994a61935fa0e8d0b1b67688d2692d0 (patch) | |
| tree | 8eff9809b158cd1e65ba0eadc2b1c140b78c4e8b /api/logic/minecraft/legacy | |
| parent | 2660418d58efb33cd3a0ab8ed9d48c359c076905 (diff) | |
| download | MultiMC-f557c1367994a61935fa0e8d0b1b67688d2692d0.tar MultiMC-f557c1367994a61935fa0e8d0b1b67688d2692d0.tar.gz MultiMC-f557c1367994a61935fa0e8d0b1b67688d2692d0.tar.lz MultiMC-f557c1367994a61935fa0e8d0b1b67688d2692d0.tar.xz MultiMC-f557c1367994a61935fa0e8d0b1b67688d2692d0.zip | |
NOISSUE stuff and things happened. Maybe.
Diffstat (limited to 'api/logic/minecraft/legacy')
| -rw-r--r-- | api/logic/minecraft/legacy/LwjglVersionList.cpp | 5 | ||||
| -rw-r--r-- | api/logic/minecraft/legacy/LwjglVersionList.h | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/api/logic/minecraft/legacy/LwjglVersionList.cpp b/api/logic/minecraft/legacy/LwjglVersionList.cpp index 7f4e7b38..3d7ad2d4 100644 --- a/api/logic/minecraft/legacy/LwjglVersionList.cpp +++ b/api/logic/minecraft/legacy/LwjglVersionList.cpp @@ -99,6 +99,7 @@ inline QDomElement getDomElementByTagName(QDomElement parent, QString tagname) void LWJGLVersionList::rssFailed(const QString& reason) { + m_rssDLJob.reset(); m_loading = false; qWarning() << "Failed to load LWJGL list. Network error: " + reason; } @@ -116,8 +117,9 @@ void LWJGLVersionList::rssSucceeded() if (!doc.setContent(m_rssData, false, &xmlErrorMsg, &errorLine)) { qWarning() << "Failed to load LWJGL list. XML error: " + xmlErrorMsg + " at line " + QString::number(errorLine); - m_loading = false; + m_rssDLJob.reset(); m_rssData.clear(); + m_loading = false; return; } m_rssData.clear(); @@ -162,5 +164,6 @@ void LWJGLVersionList::rssSucceeded() endResetModel(); qDebug() << "Loaded LWJGL list."; + m_rssDLJob.reset(); m_loading = false; } diff --git a/api/logic/minecraft/legacy/LwjglVersionList.h b/api/logic/minecraft/legacy/LwjglVersionList.h index 652a3fda..f5312e2c 100644 --- a/api/logic/minecraft/legacy/LwjglVersionList.h +++ b/api/logic/minecraft/legacy/LwjglVersionList.h @@ -78,9 +78,9 @@ public: return m_vlist[i]; } - virtual Task* getLoadTask() override + virtual shared_qobject_ptr<Task> getLoadTask() override { - return nullptr; + return m_rssDLJob; } virtual void sortVersions() override {}; |