From 858b490c74d4b560923b1b3896735d0a42c78991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Tue, 10 Jan 2017 23:03:00 +0100 Subject: GH-1778: Fix placement of modded Minecraft.jar in OneSix instances. --- api/logic/minecraft/onesix/OneSixInstance.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'api/logic/minecraft/onesix') diff --git a/api/logic/minecraft/onesix/OneSixInstance.cpp b/api/logic/minecraft/onesix/OneSixInstance.cpp index 1bc0eb77..b471ff3e 100644 --- a/api/logic/minecraft/onesix/OneSixInstance.cpp +++ b/api/logic/minecraft/onesix/OneSixInstance.cpp @@ -156,7 +156,7 @@ QString OneSixInstance::mainJarPath() const auto jarMods = getJarMods(); if (!jarMods.isEmpty()) { - return QDir(instanceRoot()).absoluteFilePath("minecraft.jar"); + return QDir(binRoot()).absoluteFilePath("minecraft.jar"); } else { @@ -392,7 +392,11 @@ std::shared_ptr OneSixInstance::createJarModdingTask() { tempJar.remove(); } - auto finalJarPath = QDir(m_inst->instanceRoot()).absoluteFilePath("minecraft.jar"); + if(!FS::ensureFolderPathExists(m_inst->binRoot())) + { + emitFailed(tr("Couldn't create the bin folder for Minecraft.jar")); + } + auto finalJarPath = QDir(m_inst->binRoot()).absoluteFilePath("minecraft.jar"); QFile finalJar(finalJarPath); if(finalJar.exists()) { -- cgit v1.2.3