summaryrefslogtreecommitdiffstats
path: root/logic/LegacyUpdate.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-11-25 00:46:52 +0100
committerPetr Mrázek <peterix@gmail.com>2013-11-25 00:46:52 +0100
commit088b039cf7de6b217a289499a8efe5a47e861829 (patch)
tree7fe8861cc33e5bf3ca9a0347b04604a9f9883d81 /logic/LegacyUpdate.cpp
parent82225a21e1b7f1671a42c1511032c59ecda0503f (diff)
downloadMultiMC-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/LegacyUpdate.cpp')
-rw-r--r--logic/LegacyUpdate.cpp6
1 files changed, 4 insertions, 2 deletions
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 <JlCompress.h>
#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);