Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 19:16:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1068 from daleglass/fix_resource_totals

Browse source 
Set resource total size to content size when using a qrc:// resource
This commit is contained in:
Kalila 2021-03-11 18:30:56 -05:00 committed by GitHub
commit 5e2cc4c4bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/networking/src/ResourceCache.cpp
View file

@ -794,8 +794,6 @@ void Resource::handleReplyFinished() {
{ "size_mb", _bytesTotal / 1000000.0 } { "size_mb", _bytesTotal / 1000000.0 }
}); });
setSize(_bytesTotal);
// Make sure we keep the Resource alive here // Make sure we keep the Resource alive here
auto self = _self.lock(); auto self = _self.lock();
ResourceCache::requestCompleted(_self); ResourceCache::requestCompleted(_self);
@ -809,6 +807,14 @@ void Resource::handleReplyFinished() {
} }
auto data = _request->getData(); auto data = _request->getData();
if (_request->getUrl().scheme() == "qrc") {
// For resources under qrc://, there's no actual download being done, so
// handleDownloadProgress never gets called. We get the full length here
// at the end.
_bytesTotal = data.length();
}
setSize(_bytesTotal);
emit loaded(data); emit loaded(data);
downloadFinished(data); downloadFinished(data);
} else { } else {