Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 1 file). Show all
Unified · Split
| @@ -456,7 +456,7 @@ void ScriptEngines::reloadAllScripts() { · 455 unmodified lines | |||
| 456 | } | 456 | } |
| 457 | 457 | ||
| 458 | ScriptEnginePointer ScriptEngines::loadScript(const QUrl& scriptFilename, bool isUserLoaded, bool loadScriptFromEditor, | 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 | if (thread() != QThread::currentThread()) { | 460 | if (thread() != QThread::currentThread()) { |
| 461 | ScriptEnginePointer result { nullptr }; | 461 | ScriptEnginePointer result { nullptr }; |
| 462 | BLOCKING_INVOKE_METHOD(this, "loadScript", Q_RETURN_ARG(ScriptEnginePointer, result), | 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 | connect(scriptEngine.data(), &ScriptEngine::scriptLoaded, this, &ScriptEngines::onScriptEngineLoaded); | 496 | connect(scriptEngine.data(), &ScriptEngine::scriptLoaded, this, &ScriptEngines::onScriptEngineLoaded); |
| 497 | connect(scriptEngine.data(), &ScriptEngine::errorLoadingScript, this, &ScriptEngines::onScriptEngineError); | 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 | if (exitWhenFinished) { | 500 | if (exitWhenFinished) { |
| 501 | connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::exitWhenFinished); | 501 | connect(scriptEngine.data(), &ScriptEngine::finished, this, &ScriptEngines::exitWhenFinished); |
| 502 | } | 502 | } |