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

call script engine shutdown when assignment stopping

Browse source
This commit is contained in:
Stephen Birarda 2017-01-19 16:59:33 -08:00
parent c5140ac695
commit 88ea6fa589
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/scripts/EntityScriptServer.cpp
View file

@ -254,7 +254,7 @@ void EntityScriptServer::clear() {
_entityViewer.clear(); _entityViewer.clear();
} }
void EntityScriptServer::shutdown() { void EntityScriptServer::shutdownScriptEngine() {
if (_entitiesScriptEngine) { if (_entitiesScriptEngine) {
_entitiesScriptEngine->disconnectNonEssentialSignals(); // disconnect all slots/signals from the script engine, except essential _entitiesScriptEngine->disconnectNonEssentialSignals(); // disconnect all slots/signals from the script engine, except essential
} }
@ -351,6 +351,8 @@ void EntityScriptServer::handleJurisdictionPacket(QSharedPointer<ReceivedMessage
} }
void EntityScriptServer::aboutToFinish() { void EntityScriptServer::aboutToFinish() {
shutdownScriptEngine();
// our entity tree is going to go away so tell that to the EntityScriptingInterface // our entity tree is going to go away so tell that to the EntityScriptingInterface
DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr); DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr);

3
assignment-client/src/scripts/EntityScriptServer.h
View file

@ -48,7 +48,8 @@ private:
void resetEntitiesScriptEngine(); void resetEntitiesScriptEngine();
void clear(); void clear();
void shutdown(); void shutdownScriptEngine();
void addingEntity(const EntityItemID& entityID); void addingEntity(const EntityItemID& entityID);
void deletingEntity(const EntityItemID& entityID); void deletingEntity(const EntityItemID& entityID);
void entityServerScriptChanging(const EntityItemID& entityID, const bool reload); void entityServerScriptChanging(const EntityItemID& entityID, const bool reload);