External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-22 19:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

GH-967 make libraries handle their own path prefix

Browse Source 
Makes it possible to mix libraries managed by FTB and MultiMC
Backport from unstable
This commit is contained in:
Petr Mrázek
2015-05-27 01:30:18 +02:00
parent 50a4a1e19e
commit f9e186ab70
9 changed files with 82 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/ftb/OneSixFTBInstance.cpp
View File

@@ -78,7 +78,7 @@ void OneSixFTBInstance::copy(const QDir &newDir)
for (auto library : libraryNames)
{
OneSixLibrary *lib = new OneSixLibrary(library);
const QString out = QDir::current().absoluteFilePath("libraries/" + lib->storagePath());
const QString out = QDir::current().absoluteFilePath("libraries/" + lib->storageSuffix());
if (QFile::exists(out))
{
continue;
@@ -87,7 +87,7 @@ void OneSixFTBInstance::copy(const QDir &newDir)
{
qCritical() << "Couldn't create folder structure for" << out;
}
if (!QFile::copy(librariesPath().absoluteFilePath(lib->storagePath()), out))
if (!QFile::copy(librariesPath().absoluteFilePath(lib->storageSuffix()), out))
{
qCritical() << "Couldn't copy" << lib->rawName();
}