Shutdown interface when test script finishes.

NissimHadar committed 8 years ago

Commit 3b566331 parent 3a542511 file · +2 −2Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngines.cpp+2−2

@@ -456,7 +456,7 @@ void ScriptEngines::reloadAllScripts() { · 455 unmodified lines
456	456	}
457	457
458	458	ScriptEnginePointer ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserLoaded, bool loadScriptFromEditor,
459		− bool activateMainWindow, bool reload, bool exitWhenFinished) {
	459	+ bool activateMainWindow, bool reload, bool exitWhenFinished) {
460	460	if (thread() != QThread::currentThread()) {
461	461	ScriptEnginePointer result { nullptr };
462	462	BLOCKING_INVOKE_METHOD(this, "loadScript", Q_RETURN_ARG(ScriptEnginePointer, result),
@@ -496,7 +496,7 @@ ScriptEnginePointer ScriptEngines::loadScript(const QUrl& scriptFilename, bool i · 33 unmodified lines
496	496	connect(scriptEngine.data(), &ScriptEngine::scriptLoaded, this, &ScriptEngines::onScriptEngineLoaded);
497	497	connect(scriptEngine.data(), &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError);
498	498
499		− // Shutdown interface when script finishes, if requested
	499	+ // Shutdown Interface when script finishes, if requested
500	500	if (exitWhenFinished) {
501	501	connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::exitWhenFinished);
502	502	}