Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 1 file). Show all
Unified · Split
| @@ -401,13 +401,14 @@ void ScriptEngines::stopAllScripts(bool restart) { · 400 unmodified lines | |||
| 401 | continue; | 401 | continue; |
| 402 | } | 402 | } |
| 403 | 403 | ||
| 404 | bool isOverrideScript = it.key().toString().compare(this->_defaultScriptsOverride.toString()); | ||
| 404 | // queue user scripts if restarting | 405 | // queue user scripts if restarting |
| 405 | if (restart && scriptEngine->isUserLoaded()) { | 406 | if (restart && (scriptEngine->isUserLoaded() || isOverrideScript)) { |
| 406 | _isReloading = true; | 407 | _isReloading = true; |
| 407 | ScriptEngine::Type type = scriptEngine->getType(); | 408 | ScriptEngine::Type type = scriptEngine->getType(); |
| 408 | 409 | ||
| 409 | connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type] (QString scriptName) { | 410 | connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type, isOverrideScript](QString scriptName) { |
| 410 | reloadScript(scriptName, true)->setType(type); | 411 | reloadScript(scriptName, !isOverrideScript)->setType(type); |
| 411 | }); | 412 | }); |
| 412 | } | 413 | } |
| 413 | 414 | ||