History

Fix ACs startup crash

Clement committed 8 years ago

Commit ba53e7a1 parent e4377a66 files · +19 −5Browse files

Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 6 files). Show all

Unified · Split

assignment-client/src/scripts/EntityScriptServer.cpp+3−0
@@ -58,6 +58,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig · 57 unmodified lines
58 DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);58 DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
59 59
60 DependencyManager::set<ResourceManager>();60 DependencyManager::set<ResourceManager>();
61 DependencyManager::set<PluginManager>();
61 62
62 DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();63 DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
63 64
@@ -572,6 +573,8 @@ void EntityScriptServer::aboutToFinish() { · 508 unmodified lines
572 573
573 DependencyManager::get<ResourceManager>()->cleanup();574 DependencyManager::get<ResourceManager>()->cleanup();
574 575
576 DependencyManager::destroy<PluginManager>();
577
575 // cleanup the AudioInjectorManager (and any still running injectors)578 // cleanup the AudioInjectorManager (and any still running injectors)
576 DependencyManager::destroy<AudioInjectorManager>();579 DependencyManager::destroy<AudioInjectorManager>();
577 DependencyManager::destroy<ScriptEngines>();580 DependencyManager::destroy<ScriptEngines>();