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

Set resource total size to content size when using a qrc:// resource

Browse source 
When a Resource is requested from qrc://, the Resource::handleDownloadProgress
event is never called, and therefore _bytesTotal remains at zero. This confuses
ResourceCache later, which has a sanity check that doesn't pass when resources
are retrieved, yet no data accumulates.

Fixes #1065
This commit is contained in:
Dale Glass 2021-02-26 20:04:53 +01:00
parent 14292a042b
commit b102b3477a
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 {