Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 10:00:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix batch-loaded local scripts

Browse source
This commit is contained in:
Seth Alves 2016-03-31 14:02:47 -07:00
parent aea06914b4
commit 63595e196e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -847,7 +847,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
QUrl url(include); QUrl url(include);
// first lets check to see if it's already a full URL // first lets check to see if it's already a full URL
if (!url.scheme().isEmpty()) { if (!url.scheme().isEmpty()) {
return url; return expandScriptUrl(normalizeScriptURL(url));
} }
// we apparently weren't a fully qualified url, so, let's assume we're relative // we apparently weren't a fully qualified url, so, let's assume we're relative
@ -864,7 +864,7 @@ QUrl ScriptEngine::resolvePath(const QString& include) const {
} }
// at this point we should have a legitimate fully qualified URL for our parent // at this point we should have a legitimate fully qualified URL for our parent
url = parentURL.resolved(url); url = expandScriptUrl(normalizeScriptURL(parentURL.resolved(url)));
return url; return url;
} }