diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-02-01 19:58:13 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-02-01 19:58:13 +0100 |
| commit | 983a40698c47739fee3786cf54c917004523ea36 (patch) | |
| tree | 4a0d73577afbf430934cd878ff23674aaa7aea74 /logic/LegacyUpdate.cpp | |
| parent | 866d7029afa10293a57d71aecbe3629399c95d06 (diff) | |
| parent | 1936bd181f57a554ce0dd757ffe9419100eb47f4 (diff) | |
| download | MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.gz MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.lz MultiMC-983a40698c47739fee3786cf54c917004523ea36.tar.xz MultiMC-983a40698c47739fee3786cf54c917004523ea36.zip | |
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
Diffstat (limited to 'logic/LegacyUpdate.cpp')
| -rw-r--r-- | logic/LegacyUpdate.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp index cb3598a7..5d82a76b 100644 --- a/logic/LegacyUpdate.cpp +++ b/logic/LegacyUpdate.cpp @@ -27,13 +27,13 @@ #include "logger/QsLog.h" #include "logic/net/URLConstants.h" -LegacyUpdate::LegacyUpdate(BaseInstance *inst, bool only_prepare, QObject *parent) - : Task(parent), m_inst(inst), m_only_prepare(only_prepare) +LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst) { } void LegacyUpdate::executeTask() { + /* if(m_only_prepare) { // FIXME: think this through some more. @@ -49,8 +49,9 @@ void LegacyUpdate::executeTask() } else { - lwjglStart(); - } + */ + lwjglStart(); + //} } void LegacyUpdate::lwjglStart() @@ -268,7 +269,6 @@ void LegacyUpdate::jarStart() auto dljob = new NetJob("Minecraft.jar for version " + version_id); - auto metacache = MMC->metacache(); auto entry = metacache->resolveEntry("versions", localPath); dljob->addNetAction(CacheDownload::make(QUrl(urlstr), entry)); @@ -425,7 +425,7 @@ void LegacyUpdate::ModTheJar() auto &mod = modList->operator[](i); // do not merge disabled mods. - if(!mod.enabled()) + if (!mod.enabled()) continue; if (mod.type() == Mod::MOD_ZIPFILE) |