Merge branch 'feat/resource-finished' of github.com:zzmp/hifi

This commit is contained in:
Zach Pomerantz 2016-03-23 13:07:24 -07:00
commit 6a98e808db
2 changed files with 4 additions and 0 deletions

View file

@ -380,6 +380,7 @@ void Resource::finishedLoading(bool success) {
_failedToLoad = true;
}
_loadPriorities.clear();
emit finished(success);
}
void Resource::reinsert() {

View file

@ -201,6 +201,9 @@ signals:
/// This can be used instead of downloadFinished to access data before it is processed.
void loaded(const QByteArray& request);
/// Fired when the resource has finished loading.
void finished(bool success);
/// Fired when the resource failed to load.
void failed(QNetworkReply::NetworkError error);