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/LegacyUpdate.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'logic/LegacyUpdate.cpp') diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp index 05442917..3fc17351 100644 --- a/logic/LegacyUpdate.cpp +++ b/logic/LegacyUpdate.cpp @@ -26,7 +26,8 @@ #include #include "logger/QsLog.h" -LegacyUpdate::LegacyUpdate(BaseInstance *inst, QObject *parent) : Task(parent), m_inst(inst) +LegacyUpdate::LegacyUpdate(BaseInstance *inst, bool prepare_for_launch, QObject *parent) + : Task(parent), m_inst(inst), m_prepare_for_launch(prepare_for_launch) { } @@ -361,7 +362,8 @@ void LegacyUpdate::ModTheJar() setStatus("Installing mods - backing up minecraft.jar..."); if (!baseJar.exists() && !QFile::copy(runnableJar.filePath(), baseJar.filePath())) { - emitFailed("It seems both the active and base jar are gone. A fresh base jar will be used on next run."); + emitFailed("It seems both the active and base jar are gone. A fresh base jar will " + "be used on next run."); inst->setShouldRebuild(true); inst->setShouldUpdate(true); inst->setShouldUseCustomBaseJar(false); -- cgit v1.2.3