Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/highfidelity/hifi into xboxLasers

Browse source
This commit is contained in:
Brad Hefta-Gaub 2016-10-18 12:16:35 -07:00
commit 0b6e041d45
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/script-engine/src/BatchLoader.cpp
View file

@ -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));

5
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -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;