From 651d2c89542fb76ad807f9856a38eaaf86f6417e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Wed, 30 Mar 2016 17:27:36 -0700 Subject: [PATCH] fix script load from disk on windows --- libraries/script-engine/src/ScriptEngines.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 0a4b1a168b..16301dc890 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -397,7 +397,18 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL Q_ARG(bool, reload)); 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()); if (scriptEngine) { return scriptEngine;