diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-01-08 01:27:40 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-01-08 01:28:33 +0100 |
| commit | fb83299e592ef7627d5914e0fbce70c570981124 (patch) | |
| tree | 573fb7524aed0059ec596bc9b426d8417469fd0f /logic/LegacyInstance.cpp | |
| parent | 28cb66e85cad786f08b40cf242cb17a70d9e7432 (diff) | |
| download | MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.tar MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.tar.gz MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.tar.lz MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.tar.xz MultiMC-fb83299e592ef7627d5914e0fbce70c570981124.zip | |
Deploy jars instead of extracting them at runtime, remove non-working nvidia fix
Diffstat (limited to 'logic/LegacyInstance.cpp')
| -rw-r--r-- | logic/LegacyInstance.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp index 0bc0961e..5ab19fc9 100644 --- a/logic/LegacyInstance.cpp +++ b/logic/LegacyInstance.cpp @@ -31,8 +31,6 @@ #include "gui/dialogs/LegacyModEditDialog.h" -#define LAUNCHER_FILE "MultiMCLauncher.jar" - LegacyInstance::LegacyInstance(const QString &rootDir, SettingsObject *settings, QObject *parent) : BaseInstance(new LegacyInstancePrivate(), rootDir, settings, parent) @@ -61,7 +59,7 @@ MinecraftProcess *LegacyInstance::prepareForLaunch(MojangAccountPtr account) pixmap.save(PathCombine(minecraftRoot(), "icon.png"), "PNG"); // extract the legacy launcher - QFile(":/java/launcher.jar").copy(PathCombine(minecraftRoot(), LAUNCHER_FILE)); + QString launcherJar = PathCombine(MMC->bin(), "jars", "MultiMCLauncher.jar"); // set the process arguments { @@ -104,7 +102,7 @@ MinecraftProcess *LegacyInstance::prepareForLaunch(MojangAccountPtr account) "minecraft.exe.heapdump"); #endif - args << "-jar" << LAUNCHER_FILE; + args << "-jar" << launcherJar; args << account->currentProfile()->name; args << account->sessionId(); args << windowTitle; |