diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-11-25 00:46:52 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-11-25 00:46:52 +0100 |
commit | 088b039cf7de6b217a289499a8efe5a47e861829 (patch) | |
tree | 7fe8861cc33e5bf3ca9a0347b04604a9f9883d81 /logic/LegacyInstance.cpp | |
parent | 82225a21e1b7f1671a42c1511032c59ecda0503f (diff) | |
download | MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.tar MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.tar.gz MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.tar.lz MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.tar.xz MultiMC-088b039cf7de6b217a289499a8efe5a47e861829.zip |
Detect java bitness on launch, use appropriate libraries
Fixes problems with latest snapshot
Diffstat (limited to 'logic/LegacyInstance.cpp')
-rw-r--r-- | logic/LegacyInstance.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp index ab6536d0..6ac03e76 100644 --- a/logic/LegacyInstance.cpp +++ b/logic/LegacyInstance.cpp @@ -44,10 +44,12 @@ LegacyInstance::LegacyInstance(const QString &rootDir, SettingsObject *settings, settings->registerSetting(new Setting("IntendedJarVersion", "")); } -Task *LegacyInstance::doUpdate() +Task *LegacyInstance::doUpdate(bool prepare_for_launch) { + // make sure the jar mods list is initialized by asking for it. auto list = jarModList(); - return new LegacyUpdate(this, this); + // create an update task + return new LegacyUpdate(this, prepare_for_launch , this); } MinecraftProcess *LegacyInstance::prepareForLaunch(MojangAccountPtr account) @@ -245,12 +247,6 @@ QString LegacyInstance::currentVersionId() const return d->m_settings->get("JarVersion").toString(); } -void LegacyInstance::setCurrentVersionId(QString val) -{ - I_D(LegacyInstance); - d->m_settings->set("JarVersion", val); -} - QString LegacyInstance::lwjglVersion() const { I_D(LegacyInstance); |