History

don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts

Seth Alves committed 10 years ago

Commit cfa847b1 parent 82990414 files · +10 −6Browse files

Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 4 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+1−1
@@ -429,7 +429,7 @@ ScriptEngine* ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserL · 428 unmodified lines
429 connect(scriptEngine, &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError);429 connect(scriptEngine, &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError);
430 430
431 // get the script engine object to load the script at the designated script URL431 // get the script engine object to load the script at the designated script URL
432 scriptEngine->loadURL(QUrl(expandScriptUrl(scriptUrl.toString())), reload);432 scriptEngine->loadURL(scriptUrl, reload);
433 }433 }
434 434
435 return scriptEngine;435 return scriptEngine;