diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-05-27 01:30:18 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-05-27 01:30:18 +0200 |
| commit | f9e186ab704401416832d723c2e70a0f7a7435b3 (patch) | |
| tree | ac6e7fd9ed66a503a276339b8d1159a1ff56bde4 /logic/minecraft/OneSixInstance.cpp | |
| parent | 50a4a1e19ef148972eb9eb116f0fdd1b6b0bcdda (diff) | |
| download | MultiMC-f9e186ab704401416832d723c2e70a0f7a7435b3.tar MultiMC-f9e186ab704401416832d723c2e70a0f7a7435b3.tar.gz MultiMC-f9e186ab704401416832d723c2e70a0f7a7435b3.tar.lz MultiMC-f9e186ab704401416832d723c2e70a0f7a7435b3.tar.xz MultiMC-f9e186ab704401416832d723c2e70a0f7a7435b3.zip | |
GH-967 make libraries handle their own path prefix
Makes it possible to mix libraries managed by FTB and MultiMC
Backport from unstable
Diffstat (limited to 'logic/minecraft/OneSixInstance.cpp')
| -rw-r--r-- | logic/minecraft/OneSixInstance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/minecraft/OneSixInstance.cpp b/logic/minecraft/OneSixInstance.cpp index c551dc9b..b2b8698f 100644 --- a/logic/minecraft/OneSixInstance.cpp +++ b/logic/minecraft/OneSixInstance.cpp @@ -139,7 +139,7 @@ BaseProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) auto libs = m_version->getActiveNormalLibs(); for (auto lib : libs) { - launchScript += "cp " + librariesPath().absoluteFilePath(lib->storagePath()) + "\n"; + launchScript += "cp " + QFileInfo(lib->storagePath()).absoluteFilePath() + "\n"; } auto jarMods = getJarMods(); if (!jarMods.isEmpty()) @@ -191,7 +191,7 @@ BaseProcess *OneSixInstance::prepareForLaunch(AuthSessionPtr session) QDir natives_dir(PathCombine(instanceRoot(), "natives/")); for (auto native : m_version->getActiveNativeLibs()) { - QFileInfo finfo(PathCombine("libraries", native->storagePath())); + QFileInfo finfo(native->storagePath()); launchScript += "ext " + finfo.absoluteFilePath() + "\n"; } launchScript += "natives " + natives_dir.absolutePath() + "\n"; |