Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into redo-polyvox-locking

Browse source
This commit is contained in:
Seth Alves 2016-03-24 21:37:25 -07:00
commit c57aa565df
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -423,12 +423,12 @@ void Resource::handleReplyFinished() {
auto result = _request->getResult();
if (result == ResourceRequest::Success) {
_data = _request->getData();
auto extraInfo = _url == _activeUrl ? "" : QString(", %1").arg(_activeUrl.toDisplayString());
qCDebug(networking).noquote() << QString("Request finished for %1%2").arg(_url.toDisplayString(), extraInfo);
auto data = _request->getData();
emit loaded(data);
downloadFinished(data);
emit loaded(_data);
downloadFinished(_data);
} else {
switch (result) {
case ResourceRequest::Result::Timeout: {

2
libraries/networking/src/ResourceCache.h
View file

@ -194,6 +194,7 @@ public:
Q_INVOKABLE void allReferencesCleared();
const QUrl& getURL() const { return _url; }
const QByteArray& getData() const { return _data; }
signals:
/// Fired when the resource has been downloaded.
@ -234,6 +235,7 @@ protected:
QHash<QPointer<QObject>, float> _loadPriorities;
QWeakPointer<Resource> _self;
QPointer<ResourceCache> _cache;
QByteArray _data;
private slots:
void handleDownloadProgress(uint64_t bytesReceived, uint64_t bytesTotal);