From f41ef31ef59e9e441746929978aac74b832cefa9 Mon Sep 17 00:00:00 2001 From: humbletim Date: Sat, 31 Oct 2020 13:50:47 -0400 Subject: [PATCH] changes per CR --- libraries/script-engine/src/ScriptCache.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/script-engine/src/ScriptCache.cpp b/libraries/script-engine/src/ScriptCache.cpp index 58c5047802..0b63803a33 100644 --- a/libraries/script-engine/src/ScriptCache.cpp +++ b/libraries/script-engine/src/ScriptCache.cpp @@ -87,8 +87,8 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable if (_scriptCache.contains(url) && !forceDownload) { auto entry = _scriptCache[url]; if (url.isLocalFile() || url.scheme().isEmpty()) { - auto mtime = QFileInfo(url.toLocalFile()).lastModified(); - QString localTime = ResourceRequest::toHttpDateString(mtime.toMSecsSinceEpoch()); + auto modifiedTime = QFileInfo(url.toLocalFile()).lastModified(); + QString localTime = ResourceRequest::toHttpDateString(modifiedTime.toMSecsSinceEpoch()); QString cachedTime = entry["last-modified"].toString(); if (cachedTime != localTime) { forceDownload = true; @@ -97,10 +97,10 @@ void ScriptCache::getScriptContents(const QString& scriptOrURL, contentAvailable } } if (!forceDownload) { - lock.unlock(); - qCDebug(scriptengine) << "Found script in cache:" << url.fileName(); - contentAvailable(url.toString(), entry["data"].toString(), true, true, STATUS_CACHED); - return; + lock.unlock(); + qCDebug(scriptengine) << "Found script in cache:" << url.fileName(); + contentAvailable(url.toString(), entry["data"].toString(), true, true, STATUS_CACHED); + return; } } { @@ -155,8 +155,8 @@ void ScriptCache::scriptContentAvailable(int maxRetries) { _activeScriptRequests.remove(url); _scriptCache[url] = { - { "data", scriptContent = req->getData() }, - { "last-modified", req->property("last-modified") }, + { "data", scriptContent = req->getData() }, + { "last-modified", req->property("last-modified") }, }; } else { auto result = req->getResult();