Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 07:32:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't explicitly destroy ScriptEngine; move emit finished to logical location

Browse source 
When DependencyManager creates new ScriptEngine it will destroy old
one on correct thread.
Previous emit finished() location causes deferred delete of Agent
while still in use.
This commit is contained in:
Simon Walton 2018-07-09 13:38:56 -07:00
commit ac43c40d73
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/Agent.cpp
View file

@ -497,6 +497,7 @@ void Agent::executeScript() {
DependencyManager::destroy<RecordingScriptingInterface>();
setFinished(true);
emit finished();
}
QUuid Agent::getSessionUUID() const {
@ -838,7 +839,6 @@ void Agent::aboutToFinish() {
// destroy all other created dependencies
DependencyManager::destroy<ScriptCache>();
DependencyManager::destroy<ScriptEngines>();
DependencyManager::destroy<ResourceCacheSharedItems>();
DependencyManager::destroy<SoundCache>();

2
libraries/networking/src/ThreadedAssignment.cpp
View file

@ -67,7 +67,7 @@ void ThreadedAssignment::setFinished(bool isFinished) {
// call our virtual aboutToFinish method - this gives the ThreadedAssignment subclass a chance to cleanup
aboutToFinish();
emit finished();
//emit finished();
}
}
}