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/ScriptEngine.cpp (1 of 4 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+2−3
@@ -220,11 +220,10 @@ void ScriptEngine::loadURL(const QUrl& scriptURL, bool reload) { · 219 unmodified lines
220 return;220 return;
221 }221 }
222 222
223 _fileNameString = scriptURL.toString();223 QUrl url = expandScriptUrl(normalizeScriptURL(scriptURL));
224 _fileNameString = url.toString();
224 _isReloading = reload;225 _isReloading = reload;
225 226
226 QUrl url(scriptURL);
227
228 bool isPending;227 bool isPending;
229 auto scriptCache = DependencyManager::get<ScriptCache>();228 auto scriptCache = DependencyManager::get<ScriptCache>();
230 scriptCache->getScript(url, this, isPending, reload);229 scriptCache->getScript(url, this, isPending, reload);