0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3372 from jamierocks/ftb-data-temp-fix

Browse Source 
GH-3304 Temporarily ignore download failures for FTB packs
This commit is contained in:
Petr Mrázek 2020-10-12 01:36:56 +02:00 committed by GitHub
commit 762ddaea65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp
View File

@ -123,16 +123,20 @@ void PackInstallTask::install()
auto dl = Net::Download::makeFile(file.url, path); auto dl = Net::Download::makeFile(file.url, path);
jobPtr->addNetAction(dl); jobPtr->addNetAction(dl);
} }
connect(jobPtr.get(), &NetJob::succeeded, this, [&]() connect(jobPtr.get(), &NetJob::succeeded, this, [&]()
{ {
jobPtr.reset(); jobPtr.reset();
emitSucceeded(); emitSucceeded();
}); });
connect(jobPtr.get(), &NetJob::failed, [&](QString reason) connect(jobPtr.get(), &NetJob::failed, [&](QString reason)
{ {
jobPtr.reset(); jobPtr.reset();
emitFailed(reason);
// FIXME: Temporarily ignore file download failures (matching FTB's installer),
// while FTB's data is fucked.
qWarning() << "Failed to download files for modpack: " + reason;
emitSucceeded();
}); });
connect(jobPtr.get(), &NetJob::progress, [&](qint64 current, qint64 total) connect(jobPtr.get(), &NetJob::progress, [&](qint64 current, qint64 total)
{ {