From 73a0266edb1a520b47e0160a86bf4bf4bce6de19 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 18 Oct 2016 11:41:15 -0700 Subject: [PATCH 1/2] Fix case in Script.include where urls is empty --- libraries/script-engine/src/BatchLoader.cpp | 6 ++++++ libraries/script-engine/src/ScriptEngine.cpp | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp index 692c0ecd7a..605d7e95bd 100644 --- a/libraries/script-engine/src/BatchLoader.cpp +++ b/libraries/script-engine/src/BatchLoader.cpp @@ -38,6 +38,12 @@ void BatchLoader::start() { _started = true; + if (_urls.size() == 0) { + _finished = true; + emit finished(_data); + return; + } + for (const auto& rawURL : _urls) { QUrl url = expandScriptUrl(normalizeScriptURL(rawURL)); diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 7a4265829b..a9e1defabe 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -1199,6 +1199,11 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac } } + // If there are no URLs left to download, don't bother attempting to download anything and return early + if (urls.size() == 0) { + return; + } + BatchLoader* loader = new BatchLoader(urls); EntityItemID capturedEntityIdentifier = currentEntityIdentifier; QUrl capturedSandboxURL = currentSandboxURL; From 9cb4756fce54c42634c401e0179b8f9ba1ad034c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 18 Oct 2016 13:57:30 -0700 Subject: [PATCH 2/2] only ScriptEngines for agent ACs --- assignment-client/src/AssignmentClient.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assignment-client/src/AssignmentClient.cpp b/assignment-client/src/AssignmentClient.cpp index 0577d8c02b..2bba2e2427 100644 --- a/assignment-client/src/AssignmentClient.cpp +++ b/assignment-client/src/AssignmentClient.cpp @@ -57,8 +57,7 @@ AssignmentClient::AssignmentClient(Assignment::Type requestAssignmentType, QStri auto scriptableAvatar = DependencyManager::set(); auto addressManager = DependencyManager::set(); - if (requestAssignmentType != Assignment::AvatarMixerType && - requestAssignmentType != Assignment::AudioMixerType) { + if (requestAssignmentType == Assignment::AgentType) { auto scriptEngines = DependencyManager::set(); }