Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 17:41:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7521 from sethalves/fix-load-from-disk

Browse source 
fix script load from disk on windows
This commit is contained in:
Brad Hefta-Gaub 2016-03-30 19:29:11 -07:00
commit 32a90b4709
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -397,7 +397,18 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL
Q_ARG(bool, reload)); Q_ARG(bool, reload));
return result; return result;
} }
QUrl scriptUrl = normalizeScriptURL(scriptFilename); QUrl scriptUrl;
if (!scriptFilename.isValid() ||
(scriptFilename.scheme() != "http" &&
scriptFilename.scheme() != "https" &&
scriptFilename.scheme() != "atp" &&
scriptFilename.scheme() != "file")) {
// deal with a "url" like c:/something
scriptUrl = normalizeScriptURL(QUrl::fromLocalFile(scriptFilename.toString()));
} else {
scriptUrl = normalizeScriptURL(scriptFilename);
}
auto scriptEngine = getScriptEngine(scriptUrl.toString()); auto scriptEngine = getScriptEngine(scriptUrl.toString());
if (scriptEngine) { if (scriptEngine) {
return scriptEngine; return scriptEngine;