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

Merge pull request #13755 from SimonWalton-HiFi/script-agent-destroy-engine

Browse source 
Fix for ScriptEngines not being released upon AC shutdown
This commit is contained in:
John Conklin II 2018-08-16 13:16:04 -07:00 committed by GitHub
commit 7f3bbaf3f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,8 +82,6 @@ Agent::Agent(ReceivedMessage& message) :
DependencyManager::set<recording::ClipCache>(); DependencyManager::set<recording::ClipCache>();
DependencyManager::set<ScriptCache>(); DependencyManager::set<ScriptCache>();
DependencyManager::set<ScriptEngines>(ScriptEngine::AGENT_SCRIPT);
DependencyManager::set<RecordingScriptingInterface>(); DependencyManager::set<RecordingScriptingInterface>();
DependencyManager::set<UsersScriptingInterface>(); DependencyManager::set<UsersScriptingInterface>();
@ -162,6 +160,8 @@ void Agent::handleAudioPacket(QSharedPointer<ReceivedMessage> message) {
static const QString AGENT_LOGGING_NAME = "agent"; static const QString AGENT_LOGGING_NAME = "agent";
void Agent::run() { void Agent::run() {
// Create ScriptEngines on threaded-assignment thread then move to main thread.
DependencyManager::set<ScriptEngines>(ScriptEngine::AGENT_SCRIPT)->moveToThread(qApp->thread());
// make sure we request our script once the agent connects to the domain // make sure we request our script once the agent connects to the domain
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
@ -497,7 +497,6 @@ void Agent::executeScript() {
Frame::clearFrameHandler(AVATAR_FRAME_TYPE); Frame::clearFrameHandler(AVATAR_FRAME_TYPE);
DependencyManager::destroy<RecordingScriptingInterface>(); DependencyManager::destroy<RecordingScriptingInterface>();
setFinished(true); setFinished(true);
} }
@ -847,7 +846,7 @@ void Agent::aboutToFinish() {
DependencyManager::destroy<recording::Deck>(); DependencyManager::destroy<recording::Deck>();
DependencyManager::destroy<recording::Recorder>(); DependencyManager::destroy<recording::Recorder>();
DependencyManager::destroy<recording::ClipCache>(); DependencyManager::destroy<recording::ClipCache>();
DependencyManager::destroy<ScriptEngine>();
QMetaObject::invokeMethod(&_avatarAudioTimer, "stop"); QMetaObject::invokeMethod(&_avatarAudioTimer, "stop");
// cleanup codec & encoder // cleanup codec & encoder