Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ytobi's aria2 fixes #4

Open
wants to merge 16 commits into
base: aria2
Choose a base branch
from
Open

ytobi's aria2 fixes #4

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
95a9f17
updated branch for testing purposes.
Aug 9, 2020
58a3b27
CI: fix git package
oldmud0 Jul 27, 2019
943901c
CI: Remove unnecessary link flags
oldmud0 Jul 27, 2019
70d244c
Use UCL instead of LZMA
oldmud0 Jul 27, 2019
1b2c02b
Bump version to 1.3.0
oldmud0 Jul 27, 2019
16332f2
Remove .exe from Linux launcher
oldmud0 Jul 27, 2019
4521a08
Fix delete task not deleting properly
oldmud0 Jan 11, 2020
d2d8ae5
Fix launcher not exiting after clicking Play
oldmud0 Jan 11, 2020
3d6bee7
applied ci changes
Aug 9, 2020
8dd8ac7
changed qarchive to internal branch
Aug 9, 2020
88bc4ef
updared readme.
Aug 11, 2020
b06a652
Revert "updared readme."
Aug 11, 2020
ba1c3c3
fix: fixed parameter mismatch connecting signal and slot
ytobi Aug 14, 2020
cebc797
fix: fixed undefine reference error.
ytobi Aug 14, 2020
677ee76
feat: include required aria2 library
ytobi Aug 14, 2020
d8ac818
feat: link aria2 library and include src
ytobi Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions launcher/updater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,12 +493,15 @@ void Updater::taskDownload(QDir &installDir, const QUrl &url, const QString &has
// (Yeah, we're gonna do this crappy trick again...)
eventLoop.reset(new QEventLoop());
QArchive::DiskExtractor extractor(filename, installDir.path(), this, false);
// Note. The parmeters of the signal QArchive::DiskExtractor::error do not match the slot.
// QArchive::DiskExtractor::error emits short code only
QObject::connect(&extractor, &QArchive::DiskExtractor::error,
[&](short code, const QString &file) {
error = true;
errorMsg = file;
errorCode = code;
qCritical() << "Error extracting" << file << "- code" << code;
[&](short code) {
const QString file("Unknown file");
error = true;
errorMsg = file;
errorCode = code;
qCritical() << "Error extracting" << file << "- code" << code;
Comment on lines +499 to +504
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change in this signal's signature is due to a major version change in QArchive that apparently was applied to this branch. I would be careful because I have not tested that new version.

emit eventLoop->quit();
});
QObject::connect(&extractor, &QArchive::DiskExtractor::progress,
Expand Down