From 93679f7c3be1899fbe5ae534ff5fd50b3ad79bc1 Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Thu, 29 Jun 2017 00:52:51 +0200
Subject: [PATCH] move the ResourceManager init back to where it was, to
 prevent problems

---
 assignment-client/src/Agent.cpp                 | 3 ++-
 assignment-client/src/entities/EntityServer.cpp | 2 +-
 tests/render-perf/src/main.cpp                  | 3 ++-
 tests/render-texture-load/src/main.cpp          | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/assignment-client/src/Agent.cpp b/assignment-client/src/Agent.cpp
index f336f1dad5..8aec5adb1f 100644
--- a/assignment-client/src/Agent.cpp
+++ b/assignment-client/src/Agent.cpp
@@ -62,6 +62,8 @@ Agent::Agent(ReceivedMessage& message) :
     _entityEditSender.setPacketsPerSecond(DEFAULT_ENTITY_PPS_PER_SCRIPT);
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
+    DependencyManager::set<ResourceManager>();
+
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
     DependencyManager::set<ResourceCacheSharedItems>();
@@ -79,7 +81,6 @@ Agent::Agent(ReceivedMessage& message) :
     DependencyManager::set<RecordingScriptingInterface>();
     DependencyManager::set<UsersScriptingInterface>();
 
-    DependencyManager::set<ResourceManager>();
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
 
diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index afcbcf4f1e..ac686e2e0a 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -31,9 +31,9 @@ EntityServer::EntityServer(ReceivedMessage& message) :
     OctreeServer(message),
     _entitySimulation(NULL)
 {
+    DependencyManager::set<ResourceManager>();
     DependencyManager::set<ResourceCacheSharedItems>();
     DependencyManager::set<ScriptCache>();
-    DependencyManager::set<ResourceManager>();
 
     auto& packetReceiver = DependencyManager::get<NodeList>()->getPacketReceiver();
     packetReceiver.registerListenerForTypes({ PacketType::EntityAdd, PacketType::EntityEdit, PacketType::EntityErase, PacketType::EntityPhysics },
diff --git a/tests/render-perf/src/main.cpp b/tests/render-perf/src/main.cpp
index 50f92ec3b9..61608f12aa 100644
--- a/tests/render-perf/src/main.cpp
+++ b/tests/render-perf/src/main.cpp
@@ -494,7 +494,6 @@ public:
         DependencyManager::set<PathUtils>();
         DependencyManager::set<SceneScriptingInterface>();
         DependencyManager::set<TestActionFactory>();
-        DependencyManager::set<ResourceManager>();
     }
 
     QTestWindow() {
@@ -520,6 +519,8 @@ public:
             _octree->getTree()->setSimulation(simpleSimulation);
             _entitySimulation = simpleSimulation;
         }
+        
+        DependencyManager::set<ResourceManager>();
 
         setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
         _size = QSize(800, 600);
diff --git a/tests/render-texture-load/src/main.cpp b/tests/render-texture-load/src/main.cpp
index 5920e04558..d85fcd6a32 100644
--- a/tests/render-texture-load/src/main.cpp
+++ b/tests/render-texture-load/src/main.cpp
@@ -289,7 +289,6 @@ public:
         DependencyManager::set<GeometryCache>();
         DependencyManager::set<ModelCache>();
         DependencyManager::set<PathUtils>();
-        DependencyManager::set<ResourceManager>();
     }
 
     struct TextureLoad {
@@ -329,7 +328,8 @@ public:
 
         installEventFilter(this);
         QThreadPool::globalInstance()->setMaxThreadCount(2);
-        QThread::currentThread()->setPriority(QThread::HighestPriority);
+        QThread::currentThread()->setPriority(QThread::HighestPriority);  
+        DependencyManager::set<ResourceManager>();
         setFlags(Qt::MSWindowsOwnDC | Qt::Window | Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowTitleHint);
         _size = QSize(800, 600);
         _renderThread._size = _size;