History

Corrected bug causing Interface not to exit at end of test.

NissimHadar committed 8 years ago

Commit 7f9f9d71 parent d5bb5822 files · +10 −0Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+9−0
@@ -498,6 +498,11 @@ ScriptEnginePointer ScriptEngines::loadScript(const QUrl& scriptFilename, bool i · 497 unmodified lines
498 connect(scriptEngine.data(), &ScriptEngine::scriptLoaded, this, &ScriptEngines::onScriptEngineLoaded);498 connect(scriptEngine.data(), &ScriptEngine::scriptLoaded, this, &ScriptEngines::onScriptEngineLoaded);
499 connect(scriptEngine.data(), &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError);499 connect(scriptEngine.data(), &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError);
500 500
501 // Shutdown Interface when script finishes, if requested
502 if (quitWhenFinished) {
503 connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::quitWhenFinished);
504 }
505
501 // get the script engine object to load the script at the designated script URL506 // get the script engine object to load the script at the designated script URL
502 scriptEngine->loadURL(scriptUrl, reload);507 scriptEngine->loadURL(scriptUrl, reload);
503 }508 }
@@ -538,6 +543,10 @@ void ScriptEngines::onScriptEngineLoaded(const QString& rawScriptURL) { · 34 unmodified lines
538 emit scriptCountChanged();543 emit scriptCountChanged();
539}544}
540 545
546void ScriptEngines::quitWhenFinished() {
547 qApp->quit();
548}
549
541int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {550int ScriptEngines::runScriptInitializers(ScriptEnginePointer scriptEngine) {
542 int ii=0;551 int ii=0;
543 for (auto initializer : _scriptInitializers) {552 for (auto initializer : _scriptInitializers) {