From cdfa38d4dd19ef8fcd95484f1e4091018f7eb12f Mon Sep 17 00:00:00 2001 From: Alexander Ivash Date: Sun, 4 Nov 2018 19:16:43 +0530 Subject: [PATCH] FB19514 - Interface crashes on attempt to apply new animation url via AvatarApp --- libraries/networking/src/ResourceCache.cpp | 11 ++++++++--- libraries/networking/src/ResourceCache.h | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index 7aad8d468a..b293cc159a 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -70,10 +70,15 @@ uint32_t ResourceCacheSharedItems::getPendingRequestsCount() const { QList> ResourceCacheSharedItems::getLoadingRequests() const { QList> result; - { - Lock lock(_mutex); - result = _loadingRequests; + Lock lock(_mutex); + + foreach(QWeakPointer resource, _loadingRequests) { + auto locked = resource.lock(); + if (locked) { + result.append(locked); + } } + return result; } diff --git a/libraries/networking/src/ResourceCache.h b/libraries/networking/src/ResourceCache.h index 33490301d7..af06cd8632 100644 --- a/libraries/networking/src/ResourceCache.h +++ b/libraries/networking/src/ResourceCache.h @@ -82,7 +82,7 @@ private: mutable Mutex _mutex; QList> _pendingRequests; - QList> _loadingRequests; + QList> _loadingRequests; const uint32_t DEFAULT_REQUEST_LIMIT = 10; uint32_t _requestLimit { DEFAULT_REQUEST_LIMIT }; };