dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into resource-meta

Browse source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2024-10-23 14:19:07 +01:00
commit 89a327d363
No known key found for this signature in database
GPG key ID: 5E39D70B4C93C38E
79 changed files with 1011 additions and 452 deletions
Download patch file Download diff file Expand all files Collapse all files

9
launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
View file

@ -136,7 +136,7 @@ bool ModrinthCreationTask::updateInstance()
}
auto old_client_overrides = Override::readOverrides("client-overrides", old_index_folder);
for (const auto& entry : old_overrides) {
for (const auto& entry : old_client_overrides) {
if (entry.isEmpty())
continue;
qDebug() << "Scheduling" << entry << "for removal";
@ -302,6 +302,13 @@ bool ModrinthCreationTask::createInstance()
loop.exec();
if (!ended_well) {
for (auto m : mods) {
delete m;
}
return ended_well;
}
QEventLoop ensureMetaLoop;
QDir folder = FS::PathCombine(instance.modsRoot(), ".index");
auto ensureMetadataTask = makeShared<EnsureMetadataTask>(resources, folder, ModPlatform::ResourceProvider::MODRINTH);