From f9747d8a446e819bbfca457d39e6ae1e695879b3 Mon Sep 17 00:00:00 2001 From: humbletim Date: Tue, 1 Nov 2016 11:46:09 -0400 Subject: [PATCH] match requested hash key url when populating batch-loaded script contents --- libraries/script-engine/src/BatchLoader.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp index 964807894e..43cc4e8e62 100644 --- a/libraries/script-engine/src/BatchLoader.cpp +++ b/libraries/script-engine/src/BatchLoader.cpp @@ -44,7 +44,6 @@ void BatchLoader::start() { return; } - for (const auto& rawURL : _urls) { QUrl url = expandScriptUrl(normalizeScriptURL(rawURL)); @@ -57,12 +56,12 @@ void BatchLoader::start() { // anything. ScriptCacheSignalProxy* proxy = new ScriptCacheSignalProxy(scriptCache.data()); - connect(proxy, &ScriptCacheSignalProxy::contentAvailable, this, [this](const QString& url, const QString& contents, bool isURL, bool success) { + connect(proxy, &ScriptCacheSignalProxy::contentAvailable, this, [this, rawURL](const QString& url, const QString& contents, bool isURL, bool success) { if (isURL && success) { - _data.insert(url, contents); + _data.insert(rawURL, contents); qCDebug(scriptengine) << "Loaded: " << url; } else { - _data.insert(url, QString()); + _data.insert(rawURL, QString()); qCDebug(scriptengine) << "Could not load: " << url; }