Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 4 files). Show all
Unified · Split
| @@ -583,15 +583,29 @@ void EntityScriptServer::handleOctreePacket(QSharedPointer<ReceivedMessage> mess · 582 unmodified lines | |||
| 583 | void EntityScriptServer::aboutToFinish() { | 583 | void EntityScriptServer::aboutToFinish() { |
| 584 | shutdownScriptEngine(); | 584 | shutdownScriptEngine(); |
| 585 | 585 | ||
| 586 | DependencyManager::get<EntityScriptingInterface>()->setEntityTree(nullptr); | ||
| 587 | DependencyManager::get<ResourceManager>()->cleanup(); | ||
| 588 | |||
| 589 | DependencyManager::destroy<AudioScriptingInterface>(); | ||
| 590 | DependencyManager::destroy<SoundCacheScriptingInterface>(); | ||
| 591 | DependencyManager::destroy<ResourceScriptingInterface>(); | ||
| 592 | DependencyManager::destroy<EntityScriptingInterface>(); | ||
| 593 | |||
| 594 | DependencyManager::destroy<SoundCache>(); | ||
| 595 | DependencyManager::destroy<ScriptCache>(); | ||
| 596 | |||
| 597 | DependencyManager::destroy<ResourceManager>(); | ||
| 598 | DependencyManager::destroy<ResourceCacheSharedItems>(); | ||
| 599 | |||
| 600 | DependencyManager::destroy<MessagesClient>(); | ||
| 601 | |||
| 586 | DependencyManager::destroy<AssignmentDynamicFactory>(); | 602 | DependencyManager::destroy<AssignmentDynamicFactory>(); |
| 587 | DependencyManager::destroy<AssignmentParentFinder>(); | 603 | DependencyManager::destroy<AssignmentParentFinder>(); |
| 604 | DependencyManager::destroy<AvatarHashMap>(); | ||
| 588 | 605 | ||
| 589 | DependencyManager::get<ResourceManager>()->cleanup(); | ||
| 590 | 606 | ||
| 591 | DependencyManager::destroy<PluginManager>(); | 607 | DependencyManager::destroy<PluginManager>(); |
| 592 | 608 | ||
| 593 | DependencyManager::destroy<ResourceScriptingInterface>(); | ||
| 594 | DependencyManager::destroy<EntityScriptingInterface>(); | ||
| 595 | 609 | ||
| 596 | // cleanup the AudioInjectorManager (and any still running injectors) | 610 | // cleanup the AudioInjectorManager (and any still running injectors) |
| 597 | DependencyManager::destroy<AudioInjectorManager>(); | 611 | DependencyManager::destroy<AudioInjectorManager>(); |