diff options
| author | Andrew <forkk@forkk.net> | 2013-11-11 11:37:15 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-11-11 11:37:15 -0600 |
| commit | 950088bee5d66b3656ba9506d7e4f9b61def5f49 (patch) | |
| tree | 895e74767b71f5907d006ce01f47ea7d1e0f97ff /logic/LegacyUpdate.cpp | |
| parent | 5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (diff) | |
| parent | e611aef0e77f727d0c77f6dea0d373e7a12b241c (diff) | |
| download | PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.tar.gz PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.tar.bz2 PrismLauncher-950088bee5d66b3656ba9506d7e4f9b61def5f49.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic/LegacyUpdate.cpp')
| -rw-r--r-- | logic/LegacyUpdate.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/logic/LegacyUpdate.cpp b/logic/LegacyUpdate.cpp index 9533f8ff..8ba97827 100644 --- a/logic/LegacyUpdate.cpp +++ b/logic/LegacyUpdate.cpp @@ -40,7 +40,7 @@ void LegacyUpdate::lwjglStart() LegacyInstance *inst = (LegacyInstance *)m_inst; lwjglVersion = inst->lwjglVersion(); - lwjglTargetPath = PathCombine("lwjgl", lwjglVersion); + lwjglTargetPath = PathCombine(MMC->settings()->get("LWJGLDir").toString(), lwjglVersion); lwjglNativesPath = PathCombine(lwjglTargetPath, "natives"); // if the 'done' file exists, we don't have to download this again @@ -361,7 +361,10 @@ void LegacyUpdate::ModTheJar() setStatus("Installing mods - backing up minecraft.jar..."); if (!baseJar.exists() && !QFile::copy(runnableJar.filePath(), baseJar.filePath())) { - emitFailed("Failed to back up minecraft.jar"); + 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); return; } } |