Browse Source

Shut down core thread after resource, game and core object managers are shut down

Marko Pintera 11 years ago
parent
commit
e84b8463ef
1 changed files with 2 additions and 3 deletions
  1. 2 3
      CamelotCore/Source/CmApplication.cpp

+ 2 - 3
CamelotCore/Source/CmApplication.cpp

@@ -64,6 +64,7 @@ namespace BansheeEngine
 		ThreadPool::startUp(cm_new<TThreadPool<ThreadBansheePolicy>>(numWorkerThreads));
 		ThreadPool::startUp(cm_new<TThreadPool<ThreadBansheePolicy>>(numWorkerThreads));
 		TaskScheduler::startUp(cm_new<TaskScheduler>());
 		TaskScheduler::startUp(cm_new<TaskScheduler>());
 		TaskScheduler::instance().removeWorker();
 		TaskScheduler::instance().removeWorker();
+		CoreThread::startUp(cm_new<CoreThread>());
 		StringTable::startUp(cm_new<StringTable>());
 		StringTable::startUp(cm_new<StringTable>());
 		DeferredCallManager::startUp(cm_new<DeferredCallManager>());
 		DeferredCallManager::startUp(cm_new<DeferredCallManager>());
 		Time::startUp(cm_new<Time>());
 		Time::startUp(cm_new<Time>());
@@ -72,8 +73,6 @@ namespace BansheeEngine
 		GameObjectManager::startUp(cm_new<GameObjectManager>());
 		GameObjectManager::startUp(cm_new<GameObjectManager>());
 		Resources::startUp(cm_new<Resources>());
 		Resources::startUp(cm_new<Resources>());
 		GpuProgramManager::startUp(cm_new<GpuProgramManager>());
 		GpuProgramManager::startUp(cm_new<GpuProgramManager>());
-
-		CoreThread::startUp(cm_new<CoreThread>());
 		RenderSystemManager::startUp(cm_new<RenderSystemManager>());
 		RenderSystemManager::startUp(cm_new<RenderSystemManager>());
 
 
 		mPrimaryWindow = RenderSystemManager::instance().initialize(desc.renderSystem, desc.primaryWindowDesc);
 		mPrimaryWindow = RenderSystemManager::instance().initialize(desc.renderSystem, desc.primaryWindowDesc);
@@ -190,7 +189,6 @@ namespace BansheeEngine
 
 
 		RendererManager::shutDown();
 		RendererManager::shutDown();
 		RenderSystemManager::shutDown();
 		RenderSystemManager::shutDown();
-		CoreThread::shutDown();
 		Input::shutDown();
 		Input::shutDown();
 
 
 		GpuProgramManager::shutDown();
 		GpuProgramManager::shutDown();
@@ -202,6 +200,7 @@ namespace BansheeEngine
 		DeferredCallManager::shutDown();
 		DeferredCallManager::shutDown();
 		StringTable::shutDown();
 		StringTable::shutDown();
 
 
+		CoreThread::shutDown();
 		TaskScheduler::shutDown();
 		TaskScheduler::shutDown();
 		ThreadPool::shutDown();
 		ThreadPool::shutDown();
 		Profiler::shutDown();
 		Profiler::shutDown();