diff options
| author | Forkk <forkk@forkk.net> | 2014-01-07 18:31:49 -0600 |
|---|---|---|
| committer | Forkk <forkk@forkk.net> | 2014-01-07 18:31:49 -0600 |
| commit | 3629f9b9995e375dad181268f5a70dc6cb7697a2 (patch) | |
| tree | df2a719ebb12f129165c487ab730a6328c9750e7 /logic/LegacyInstance.cpp | |
| parent | a14eeab2d6f6437f0cbd7402537ef6634085f7ac (diff) | |
| parent | fb83299e592ef7627d5914e0fbce70c570981124 (diff) | |
| download | MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.tar MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.tar.gz MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.tar.lz MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.tar.xz MultiMC-3629f9b9995e375dad181268f5a70dc6cb7697a2.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into new-version-system
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; |