From 088b039cf7de6b217a289499a8efe5a47e861829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 25 Nov 2013 00:46:52 +0100 Subject: Detect java bitness on launch, use appropriate libraries Fixes problems with latest snapshot --- logic/LegacyInstance.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'logic/LegacyInstance.cpp') 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); -- cgit v1.2.3