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/ftb/OneSixFTBInstance.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/ftb/OneSixFTBInstance.cpp')
| -rw-r--r-- | logic/ftb/OneSixFTBInstance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/ftb/OneSixFTBInstance.cpp index a8ea3031..88c885b9 100644 --- a/logic/ftb/OneSixFTBInstance.cpp +++ b/logic/ftb/OneSixFTBInstance.cpp @@ -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(); } |