mirror of
https://github.com/overte-org/overte.git
synced 2025-08-10 10:00:18 +02:00
fix batch-loaded local scripts
This commit is contained in:
parent
aea06914b4
commit
63595e196e
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue