Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 15:23:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #16022 from amerhifi/master

Browse source 
bugz- 982 : adding ability to reload defaultOverride script without saving to set…
This commit is contained in:
Amer 2019-08-02 12:58:40 -07:00 committed by GitHub
commit 93d5b2a35a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -401,13 +401,14 @@ void ScriptEngines::stopAllScripts(bool restart) {
continue; continue;
} }
bool isOverrideScript = it.key().toString().compare(this->_defaultScriptsOverride.toString());
// queue user scripts if restarting // queue user scripts if restarting
if (restart && scriptEngine->isUserLoaded()) { if (restart && (scriptEngine->isUserLoaded() || isOverrideScript)) {
_isReloading = true; _isReloading = true;
ScriptEngine::Type type = scriptEngine->getType(); ScriptEngine::Type type = scriptEngine->getType();
connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type] (QString scriptName) { connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type, isOverrideScript] (QString scriptName) {
reloadScript(scriptName, true)->setType(type); reloadScript(scriptName, !isOverrideScript)->setType(type);
}); });
} }