Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 03:48:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'baseball' of https://github.com/huffman/hifi into baseball

Browse source
This commit is contained in:
Stephen Birarda 2015-11-09 14:04:39 -08:00
commit 917b746a68
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -902,15 +902,20 @@ void ScriptEngine::include(const QStringList& includeFiles, QScriptValue callbac
BatchLoader* loader = new BatchLoader(urls); BatchLoader* loader = new BatchLoader(urls);
auto evaluateScripts = [=](const QMap<QUrl, QString>& data) { auto evaluateScripts = [=](const QMap<QUrl, QString>& data) {
auto parentURL = _parentURL;
for (QUrl url : urls) { for (QUrl url : urls) {
QString contents = data[url]; QString contents = data[url];
if (contents.isNull()) { if (contents.isNull()) {
qCDebug(scriptengine) << "Error loading file: " << url << "line:" << __LINE__; qCDebug(scriptengine) << "Error loading file: " << url << "line:" << __LINE__;
} else { } else {
// Set the parent url so that path resolution will be relative
// to this script's url during its initial evaluation
_parentURL = url.toString();
QScriptValue result = evaluate(contents, url.toString()); QScriptValue result = evaluate(contents, url.toString());
} }
} }
_parentURL = parentURL;
if (callback.isFunction()) { if (callback.isFunction()) {
QScriptValue(callback).call(); QScriptValue(callback).call();
} }