Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 3 files). Show all
Unified · Split
| @@ -160,7 +160,6 @@ void ScriptEngines::shutdownScripting() { · 159 unmodified lines | |||
| 160 | scriptEngine->disconnect(this); | 160 | scriptEngine->disconnect(this); |
| 161 | 161 | ||
| 162 | // Gracefully stop the engine's scripting thread | 162 | // Gracefully stop the engine's scripting thread |
| 163 | scriptEngine->setIsStopping(); | ||
| 164 | scriptEngine->stop(); | 163 | scriptEngine->stop(); |
| 165 | 164 | ||
| 166 | // We need to wait for the engine to be done running before we proceed, because we don't | 165 | // We need to wait for the engine to be done running before we proceed, because we don't |
| @@ -352,8 +351,7 @@ void ScriptEngines::stopAllScripts(bool restart) { · 185 unmodified lines | |||
| 352 | reloadScript(scriptName); | 351 | reloadScript(scriptName); |
| 353 | }); | 352 | }); |
| 354 | } | 353 | } |
| 355 | it.value()->setIsStopping(); | 354 | it.value()->stop(); |
| 356 | QMetaObject::invokeMethod(it.value(), "stop"); | ||
| 357 | qCDebug(scriptengine) << "stopping script..." << it.key(); | 355 | qCDebug(scriptengine) << "stopping script..." << it.key(); |
| 358 | } | 356 | } |
| 359 | } | 357 | } |
| @@ -376,7 +374,6 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) { · 16 unmodified lines | |||
| 376 | reloadScript(scriptName); | 374 | reloadScript(scriptName); |
| 377 | }); | 375 | }); |
| 378 | } | 376 | } |
| 379 | scriptEngine->setIsStopping(); | ||
| 380 | scriptEngine->stop(); | 377 | scriptEngine->stop(); |
| 381 | stoppedScript = true; | 378 | stoppedScript = true; |
| 382 | qCDebug(scriptengine) << "stopping script..." << scriptURL; | 379 | qCDebug(scriptengine) << "stopping script..." << scriptURL; |