From 73a0266edb1a520b47e0160a86bf4bf4bce6de19 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Tue, 18 Oct 2016 11:41:15 -0700
Subject: [PATCH] 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;