diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-11 04:47:09 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-11 04:47:09 +0100 |
| commit | 997054a5351cd6187f578d2ac24df661027bf7cc (patch) | |
| tree | 895e74767b71f5907d006ce01f47ea7d1e0f97ff /logic | |
| parent | cc6e9358fe39abc78eaa5be5b37213faf3605674 (diff) | |
| parent | e611aef0e77f727d0c77f6dea0d373e7a12b241c (diff) | |
| download | PrismLauncher-997054a5351cd6187f578d2ac24df661027bf7cc.tar.gz PrismLauncher-997054a5351cd6187f578d2ac24df661027bf7cc.tar.bz2 PrismLauncher-997054a5351cd6187f578d2ac24df661027bf7cc.zip | |
Merge branch 'develop'
Diffstat (limited to 'logic')
| -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; } } |