aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
diff options
context:
space:
mode:
authorRachel Powers <508861+Ryex@users.noreply.github.com>2022-12-08 18:42:51 -0700
committerRachel Powers <508861+Ryex@users.noreply.github.com>2022-12-08 18:42:51 -0700
commit0f48e0fc06fa89aabea639da8a91fc539c70e138 (patch)
tree85be7c932b80a9989783c5bba0af79ead0309a1d /launcher/modplatform/flame/FlameInstanceCreationTask.cpp
parentc390e211eee9adbfdcbe9dfb0a2e23303e046920 (diff)
downloadPrismLauncher-0f48e0fc06fa89aabea639da8a91fc539c70e138.tar.gz
PrismLauncher-0f48e0fc06fa89aabea639da8a91fc539c70e138.tar.bz2
PrismLauncher-0f48e0fc06fa89aabea639da8a91fc539c70e138.zip
fix(blockedmods): Track and use targetFolder for blocked files
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/modplatform/flame/FlameInstanceCreationTask.cpp')
-rw-r--r--launcher/modplatform/flame/FlameInstanceCreationTask.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
index f9258f24..ef635243 100644
--- a/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
+++ b/launcher/modplatform/flame/FlameInstanceCreationTask.cpp
@@ -419,6 +419,7 @@ void FlameCreationTask::idResolverSucceeded(QEventLoop& loop)
blocked_mod.hash = result.hash;
blocked_mod.matched = false;
blocked_mod.localPath = "";
+ blocked_mod.targetFolder = result.targetFolder;
blocked_mods.append(blocked_mod);
@@ -464,7 +465,7 @@ void FlameCreationTask::copyBlockedMods(QList<BlockedMod> const& blocked_mods)
continue;
}
- auto dest_path = FS::PathCombine(m_stagingPath, "minecraft", "mods", mod.name);
+ auto dest_path = FS::PathCombine(m_stagingPath, "minecraft", mod.targetFolder, mod.name);
setStatus(tr("Copying Blocked Mods (%1 out of %2 are done)").arg(QString::number(i), QString::number(total)));