diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-09-30 03:29:12 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-09-30 03:29:12 +0200 |
commit | c05a39147a462d610dabaf89dae59c004e7dd539 (patch) | |
tree | 10cff4a66c8d9999df7e02648b72b1c7a289ada5 /logic/lists | |
parent | 2173abb9a87c67b53e64c9bdebbba5fa6b4d4b7d (diff) | |
parent | e45b444242104e557f1bce14e9c11e3792bbe41f (diff) | |
download | MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.gz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.lz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.tar.xz MultiMC-c05a39147a462d610dabaf89dae59c004e7dd539.zip |
Implemented xz and pack200 unpackers required for proper forge installation.
Merge branch 'feature_forge_unpackers' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'logic/lists')
-rw-r--r-- | logic/lists/ForgeVersionList.cpp | 2 | ||||
-rw-r--r-- | logic/lists/MinecraftVersionList.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/logic/lists/ForgeVersionList.cpp b/logic/lists/ForgeVersionList.cpp index 721f2c0a..e2adbf3b 100644 --- a/logic/lists/ForgeVersionList.cpp +++ b/logic/lists/ForgeVersionList.cpp @@ -162,7 +162,7 @@ void ForgeListLoadTask::executeTask() auto job = new DownloadJob("Version index"); // we do not care if the version is stale or not. auto forgeListEntry = MMC->metacache()->resolveEntry("minecraftforge", "list.json"); - job->add(QUrl(JSON_URL), forgeListEntry); + job->addCacheDownload(QUrl(JSON_URL), forgeListEntry); listJob.reset(job); connect(listJob.data(), SIGNAL(succeeded()), SLOT(list_downloaded())); connect(listJob.data(), SIGNAL(failed()), SLOT(versionFileFailed())); diff --git a/logic/lists/MinecraftVersionList.h b/logic/lists/MinecraftVersionList.h index fb28ddfe..ed68efbb 100644 --- a/logic/lists/MinecraftVersionList.h +++ b/logic/lists/MinecraftVersionList.h @@ -46,7 +46,7 @@ public: protected: QList<BaseVersionPtr> m_vlist; - bool m_loaded; + bool m_loaded = false; protected slots: virtual void updateListData(QList<BaseVersionPtr> versions); |