From b97634a49b8cb33ceaf0412aa51c5fcb48fd4f9a Mon Sep 17 00:00:00 2001 From: pichotm Date: Sun, 27 Aug 2023 21:39:08 +0200 Subject: [PATCH] fix(streaming/native): fix issue with empty referenceHash from streaming natives --- .../src/ResourceCacheDeviceV2.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/components/citizen-resources-client/src/ResourceCacheDeviceV2.cpp b/code/components/citizen-resources-client/src/ResourceCacheDeviceV2.cpp index 1364b1ae7b..c77ff31432 100644 --- a/code/components/citizen-resources-client/src/ResourceCacheDeviceV2.cpp +++ b/code/components/citizen-resources-client/src/ResourceCacheDeviceV2.cpp @@ -342,8 +342,8 @@ concurrency::task ResourceCacheDeviceV2::FetchEntry(const std::s std::unique_lock lock(ms_lock); const auto& e = entry->get(); - const auto& referenceHash = e.referenceHash; - auto it = ms_entries.find(referenceHash); + const auto& remoteHash = (e.referenceHash.empty()) ? e.remoteUrl : e.referenceHash; + auto it = ms_entries.find(remoteHash); if (it == ms_entries.end() || !it->second) { @@ -355,7 +355,7 @@ concurrency::task ResourceCacheDeviceV2::FetchEntry(const std::s } else { - it = ms_entries.emplace(referenceHash, std::move(retTask)).first; + it = ms_entries.emplace(remoteHash, std::move(retTask)).first; } } @@ -371,8 +371,8 @@ void ResourceCacheDeviceV2::UnfetchEntry(const std::string& fileName) std::unique_lock lock(ms_lock); const auto& e = entry->get(); - const auto& referenceHash = e.referenceHash; - auto it = ms_entries.find(referenceHash); + const auto& remoteHash = (e.referenceHash.empty()) ? e.remoteUrl : e.referenceHash; + auto it = ms_entries.find(remoteHash); if (it != ms_entries.end()) {