Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-28 22:50:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14546 from danteruiz/fix-reload-scripts

Browse source 
fix realod all scripts functionality broken by PR14478
This commit is contained in:
Brad Hefta-Gaub 2018-12-09 17:30:36 -08:00 committed by GitHub
commit a005f9e9ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,8 @@ static const QUrl DEFAULT_SCRIPTS_LOCATION { "file:///~//defaultScripts.js" };
// Using a QVariantList so this is human-readable in the settings file // Using a QVariantList so this is human-readable in the settings file
static Setting::Handle<QVariantList> runningScriptsHandle(SETTINGS_KEY, { QVariant(DEFAULT_SCRIPTS_LOCATION) }); static Setting::Handle<QVariantList> runningScriptsHandle(SETTINGS_KEY, { QVariant(DEFAULT_SCRIPTS_LOCATION) });
const int RELOAD_ALL_SCRIPTS_TIMEOUT = 1000;
ScriptsModel& getScriptsModel() { ScriptsModel& getScriptsModel() {
static ScriptsModel scriptsModel; static ScriptsModel scriptsModel;
@ -386,15 +388,10 @@ void ScriptEngines::stopAllScripts(bool restart) {
// queue user scripts if restarting // queue user scripts if restarting
if (restart && scriptEngine->isUserLoaded()) { if (restart && scriptEngine->isUserLoaded()) {
_isReloading = true; _isReloading = true;
bool lastScript = (it == _scriptEnginesHash.constEnd() - 1);
ScriptEngine::Type type = scriptEngine->getType(); ScriptEngine::Type type = scriptEngine->getType();
connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type, lastScript] (QString scriptName) { connect(scriptEngine.data(), &ScriptEngine::finished, this, [this, type] (QString scriptName) {
reloadScript(scriptName, true)->setType(type); reloadScript(scriptName, true)->setType(type);
if (lastScript) {
_isReloading = false;
}
}); });
} }
@ -404,6 +401,9 @@ void ScriptEngines::stopAllScripts(bool restart) {
if (restart) { if (restart) {
qCDebug(scriptengine) << "stopAllScripts -- emitting scriptsReloading"; qCDebug(scriptengine) << "stopAllScripts -- emitting scriptsReloading";
QTimer::singleShot(RELOAD_ALL_SCRIPTS_TIMEOUT, this, [&] {
_isReloading = false;
});
emit scriptsReloading(); emit scriptsReloading();
} }
} }