diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2020-10-12 01:36:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-12 01:36:56 +0200 |
| commit | 762ddaea6578d552dabaffefd7ea6942776f3eff (patch) | |
| tree | eb2e988e4979cdda311bcdb3b29b89a040ba1de5 | |
| parent | dded11004fc92e6edcfe1e64e68e534085d05868 (diff) | |
| parent | 05ffcf706bff92bdc48f3063d6a64508f8b7674c (diff) | |
| download | MultiMC-762ddaea6578d552dabaffefd7ea6942776f3eff.tar MultiMC-762ddaea6578d552dabaffefd7ea6942776f3eff.tar.gz MultiMC-762ddaea6578d552dabaffefd7ea6942776f3eff.tar.lz MultiMC-762ddaea6578d552dabaffefd7ea6942776f3eff.tar.xz MultiMC-762ddaea6578d552dabaffefd7ea6942776f3eff.zip | |
Merge pull request #3372 from jamierocks/ftb-data-temp-fix
GH-3304 Temporarily ignore download failures for FTB packs
| -rw-r--r-- | api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp b/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp index fdfe560a..912beb67 100644 --- a/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp +++ b/api/logic/modplatform/modpacksch/FTBPackInstallTask.cpp @@ -123,16 +123,20 @@ void PackInstallTask::install() auto dl = Net::Download::makeFile(file.url, path); jobPtr->addNetAction(dl); } + connect(jobPtr.get(), &NetJob::succeeded, this, [&]() { jobPtr.reset(); emitSucceeded(); }); - connect(jobPtr.get(), &NetJob::failed, [&](QString reason) { 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) { |