History

Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2

Wayne Chen committed 7 years ago

Commit c85b8402 parents 6707bf5 76d2519360 files · +6488 −3872Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+1−6
@@ -112,7 +112,7 @@ QUrl expandScriptUrl(const QUrl& rawScriptURL) { · 111 unmodified lines
112 112
113 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();113 QUrl defaultScriptsLoc = PathUtils::defaultScriptsLocation();
114 if (!defaultScriptsLoc.isParentOf(url)) {114 if (!defaultScriptsLoc.isParentOf(url)) {
115 qCWarning(scriptengine) << "Script.include() ignoring file path" << rawScriptURL115 qCWarning(scriptengine) << "Script.include() ignoring file path"
116 << "-- outside of standard libraries: "116 << "-- outside of standard libraries: "
117 << url.path()117 << url.path()
118 << defaultScriptsLoc.path();118 << defaultScriptsLoc.path();
@@ -398,7 +398,6 @@ void ScriptEngines::stopAllScripts(bool restart) { · 279 unmodified lines
398 }398 }
399 399
400 // stop all scripts400 // stop all scripts
401 qCDebug(scriptengine) << "stopping script..." << it.key();
402 scriptEngine->stop();401 scriptEngine->stop();
403 removeScriptEngine(scriptEngine);402 removeScriptEngine(scriptEngine);
404 }403 }
@@ -408,11 +407,8 @@ void ScriptEngines::stopAllScripts(bool restart) { · 3 unmodified lines
408 for(const auto &scriptName : toReload) {407 for(const auto &scriptName : toReload) {
409 auto scriptEngine = getScriptEngine(scriptName);408 auto scriptEngine = getScriptEngine(scriptName);
410 if (scriptEngine && !scriptEngine->isFinished()) {409 if (scriptEngine && !scriptEngine->isFinished()) {
411 qCDebug(scriptengine) << "waiting on script:" << scriptName;
412 scriptEngine->waitTillDoneRunning();410 scriptEngine->waitTillDoneRunning();
413 qCDebug(scriptengine) << "done waiting on script:" << scriptName;
414 }411 }
415 qCDebug(scriptengine) << "reloading script..." << scriptName;
416 reloadScript(scriptName);412 reloadScript(scriptName);
417 }413 }
418 if (restart) {414 if (restart) {
@@ -450,7 +446,6 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) { · 31 unmodified lines
450 scriptEngine->stop();446 scriptEngine->stop();
451 removeScriptEngine(scriptEngine);447 removeScriptEngine(scriptEngine);
452 stoppedScript = true;448 stoppedScript = true;
453 qCDebug(scriptengine) << "stopping script..." << scriptURL;
454 }449 }
455 }450 }
456 return stoppedScript;451 return stoppedScript;