From d05f1ac87f38e195ce8c956a1c1a624efcd42662 Mon Sep 17 00:00:00 2001 From: amerhifi Date: Fri, 2 Aug 2019 11:23:33 -0700 Subject: [PATCH 1/2] adding ability to reload defaultOverrdie script without saving to settings: --- libraries/script-engine/src/ScriptEngines.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index da698c6e4e..96d4b79594 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -401,13 +401,14 @@ void ScriptEngines::stopAllScripts(bool restart) { continue; } + bool isOverrideScript = it.key().toString().compare(this->_defaultScriptsOverride.toString()); // queue user scripts if restarting - if (restart && scriptEngine->isUserLoaded()) { + if (restart && (scriptEngine->isUserLoaded() || isOverrideScript)) { _isReloading = true; ScriptEngine::Type type = scriptEngine->getType(); - connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type] (QString scriptName) { - reloadScript(scriptName, true)->setType(type); + connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type, isOverrideScript](QString scriptName) { + reloadScript(scriptName, !isOverrideScript)->setType(type); }); } From 0ee9de7ed823219b28afaaa64f86450076a847fe Mon Sep 17 00:00:00 2001 From: amerhifi Date: Fri, 2 Aug 2019 11:24:21 -0700 Subject: [PATCH 2/2] lambda space --- libraries/script-engine/src/ScriptEngines.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/script-engine/src/ScriptEngines.cpp b/libraries/script-engine/src/ScriptEngines.cpp index 96d4b79594..381377c9f4 100644 --- a/libraries/script-engine/src/ScriptEngines.cpp +++ b/libraries/script-engine/src/ScriptEngines.cpp @@ -407,7 +407,7 @@ void ScriptEngines::stopAllScripts(bool restart) { _isReloading = true; ScriptEngine::Type type = scriptEngine->getType(); - connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type, isOverrideScript](QString scriptName) { + connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type, isOverrideScript] (QString scriptName) { reloadScript(scriptName, !isOverrideScript)->setType(type); }); }