Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 18:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix bug with NetworkTexture occasionally breaking on assert

Browse source
This commit is contained in:
Ryan Huffman 2015-08-27 12:48:55 -07:00
parent a49a1eb0d6
commit b30a008162
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -206,7 +206,7 @@ Resource::Resource(const QUrl& url, bool delayLoad) :
// start loading immediately unless instructed otherwise
if (!(_startedLoading || delayLoad)) {
QTimer::singleShot(1, this, &Resource::attemptRequest);
QTimer::singleShot(0, this, &Resource::ensureLoading);
}
}
@ -333,8 +333,6 @@ void Resource::reinsert() {
void Resource::makeRequest() {
Q_ASSERT(!_request);
static const int REPLY_TIMEOUT_MS = 5000;
_request = ResourceManager::createResourceRequest(this, _activeUrl);
if (!_request) {
@ -366,7 +364,7 @@ void Resource::handleReplyFinished() {
auto result = _request->getResult();
if (result == ResourceRequest::SUCCESS) {
_data = _request->getData();
qDebug() << "Reqeust finsihed for " << _url << ", " << _activeUrl;
qDebug() << "Request finished for " << _url << ", " << _activeUrl;
_request->disconnect(this);
_request->deleteLater();
@ -408,7 +406,8 @@ void Resource::handleReplyFinished() {
break;
}
emit failed(QNetworkReply::UnknownNetworkError);
auto error = result == ResourceRequest::TIMEOUT ? QNetworkReply::TimeoutError : QNetworkReply::UnknownNetworkError;
emit failed(error);
if (!retry) {
ResourceCache::requestCompleted(this);