From ec856b2026c7ceecab5f74942bb36661d7c6ae67 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 22 Aug 2015 01:55:26 +0300
Subject: Add init to resource manager.

---
 src/resources/resourcemanager.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'src/resources/resourcemanager.cpp')

diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index bec7914fc..50d6ccb6d 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -58,6 +58,7 @@
 
 #include "debug.h"
 
+ResourceManager *resourceManager = nullptr;
 ResourceManager *ResourceManager::instance = nullptr;
 
 ResourceManager::ResourceManager() :
@@ -171,6 +172,12 @@ ResourceManager::~ResourceManager()
     clearScheduled();
 }
 
+void ResourceManager::init()
+{
+    if (!resourceManager)
+        resourceManager = new ResourceManager;
+}
+
 void ResourceManager::cleanUp(Resource *const res)
 {
     if (!res)
@@ -949,10 +956,7 @@ void ResourceManager::decRefDelete(Resource *const res)
 
 ResourceManager *ResourceManager::getInstance()
 {
-    // Create a new instance if necessary.
-    if (!instance)
-        instance = new ResourceManager;
-    return instance;
+    return resourceManager;
 }
 
 void ResourceManager::deleteInstance()
-- 
cgit v1.2.3-60-g2f50