Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 03:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

prevent have more than one instance of a script after reloading script

Browse source
This commit is contained in:
Dante Ruiz 2018-06-14 14:00:40 -07:00
parent 4f561b00da
commit 8b4b95f890
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -432,10 +432,13 @@ bool ScriptEngines::stopScript(const QString& rawScriptURL, bool restart) {
ScriptEngine::Type type = scriptEngine->getType(); ScriptEngine::Type type = scriptEngine->getType();
auto scriptCache = DependencyManager::get<ScriptCache>(); auto scriptCache = DependencyManager::get<ScriptCache>();
scriptCache->deleteScript(scriptURL); scriptCache->deleteScript(scriptURL);
connect(scriptEngine.data(), &ScriptEngine::finished,
this, [this, isUserLoaded, type](QString scriptName, ScriptEnginePointer engine) { if (!scriptEngine->isStopping()) {
reloadScript(scriptName, isUserLoaded)->setType(type); connect(scriptEngine.data(), &ScriptEngine::finished,
}); this, [this, isUserLoaded, type](QString scriptName, ScriptEnginePointer engine) {
reloadScript(scriptName, isUserLoaded)->setType(type);
});
}
} }
scriptEngine->stop(); scriptEngine->stop();
stoppedScript = true; stoppedScript = true;