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

FB19514 - Interface crashes on attempt to apply new animation url via AvatarApp

Browse source
This commit is contained in:
Alexander Ivash 2018-11-04 19:16:43 +05:30
parent 5c78a463de
commit cdfa38d4dd
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,10 +70,15 @@ uint32_t ResourceCacheSharedItems::getPendingRequestsCount() const {
QList<QSharedPointer<Resource>> ResourceCacheSharedItems::getLoadingRequests() const { QList<QSharedPointer<Resource>> ResourceCacheSharedItems::getLoadingRequests() const {
QList<QSharedPointer<Resource>> result; QList<QSharedPointer<Resource>> result;
{ Lock lock(_mutex);
Lock lock(_mutex);
result = _loadingRequests; foreach(QWeakPointer<Resource> resource, _loadingRequests) {
auto locked = resource.lock();
if (locked) {
result.append(locked);
}
} }
return result; return result;
} }

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

@ -82,7 +82,7 @@ private:
mutable Mutex _mutex; mutable Mutex _mutex;
QList<QWeakPointer<Resource>> _pendingRequests; QList<QWeakPointer<Resource>> _pendingRequests;
QList<QSharedPointer<Resource>> _loadingRequests; QList<QWeakPointer<Resource>> _loadingRequests;
const uint32_t DEFAULT_REQUEST_LIMIT = 10; const uint32_t DEFAULT_REQUEST_LIMIT = 10;
uint32_t _requestLimit { DEFAULT_REQUEST_LIMIT }; uint32_t _requestLimit { DEFAULT_REQUEST_LIMIT };
}; };