Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 2 files). Show all
Unified · Split
| @@ -351,7 +351,7 @@ void ScriptEngines::stopAllScripts(bool restart) { · 350 unmodified lines | |||
| 351 | reloadScript(scriptName); | 351 | reloadScript(scriptName); |
| 352 | }); | 352 | }); |
| 353 | } | 353 | } |
| 354 | it.value()->flagAsStopping(); | 354 | it.value()->setIsStopping(); |
| 355 | QMetaObject::invokeMethod(it.value(), "stop"); | 355 | QMetaObject::invokeMethod(it.value(), "stop"); |
| 356 | //it.value()->stop(); | 356 | //it.value()->stop(); |
| 357 | qCDebug(scriptengine) << "stopping script..." << it.key(); | 357 | qCDebug(scriptengine) << "stopping script..." << it.key(); |
| @@ -370,7 +370,7 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) { · 12 unmodified lines | |||
| 370 | if (_scriptEnginesHash.contains(scriptURL)) { | 370 | if (_scriptEnginesHash.contains(scriptURL)) { |
| 371 | ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURL]; | 371 | ScriptEngine* scriptEngine = _scriptEnginesHash[scriptURL]; |
| 372 | if (restart) { | 372 | if (restart) { |
| 373 | scriptEngine->flagAsStopping(); | 373 | scriptEngine->setIsStopping(); |
| 374 | auto scriptCache = DependencyManager::get<ScriptCache>(); | 374 | auto scriptCache = DependencyManager::get<ScriptCache>(); |
| 375 | scriptCache->deleteScript(scriptURL); | 375 | scriptCache->deleteScript(scriptURL); |
| 376 | connect(scriptEngine, &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) { | 376 | connect(scriptEngine, &ScriptEngine::finished, this, [this](QString scriptName, ScriptEngine* engine) { |