From aedf41694936511ec6d053483265c6a6938f2aac Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Tue, 7 Apr 2015 17:23:18 +0200
Subject: [PATCH] (Initializer) Added explicit (un)initialisation

Former-commit-id: 198287ca1cc4e8a53531263a90bcffbcab1ef2b2
---
 include/Nazara/Core/Initializer.hpp |  4 +++-
 include/Nazara/Core/Initializer.inl | 25 ++++++++++++++++++++-----
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/include/Nazara/Core/Initializer.hpp b/include/Nazara/Core/Initializer.hpp
index 3737593df..64081f891 100644
--- a/include/Nazara/Core/Initializer.hpp
+++ b/include/Nazara/Core/Initializer.hpp
@@ -13,10 +13,12 @@ template<typename... Args>
 class NzInitializer
 {
 	public:
-		NzInitializer();
+		NzInitializer(bool initialize = true);
 		~NzInitializer();
 
+		bool Initialize();
 		bool IsInitialized() const;
+		void Uninitialize();
 
 		operator bool() const;
 
diff --git a/include/Nazara/Core/Initializer.inl b/include/Nazara/Core/Initializer.inl
index 732a12418..091831521 100644
--- a/include/Nazara/Core/Initializer.inl
+++ b/include/Nazara/Core/Initializer.inl
@@ -43,16 +43,24 @@ struct NzImplInitializer<>
 };
 
 template<typename... Args>
-NzInitializer<Args...>::NzInitializer()
+NzInitializer<Args...>::NzInitializer(bool initialize) :
+m_initialized(false)
 {
-	m_initialized = NzImplInitializer<Args...>::Init();
+	if (initialize)
+		Initialize();
 }
 
 template<typename... Args>
 NzInitializer<Args...>::~NzInitializer()
 {
-	if (m_initialized)
-		NzImplInitializer<Args...>::Uninit();
+	Uninitialize();
+}
+
+template<typename... Args>
+bool NzInitializer<Args...>::Initialize()
+{
+	if (!m_initialized)
+		m_initialized = NzImplInitializer<Args...>::Init();
 }
 
 template<typename... Args>
@@ -61,10 +69,17 @@ bool NzInitializer<Args...>::IsInitialized() const
 	return m_initialized;
 }
 
+template<typename... Args>
+void NzInitializer<Args...>::Uninitialize()
+{
+	if (m_initialized)
+		NzImplInitializer<Args...>::Uninit();
+}
+
 template<typename... Args>
 NzInitializer<Args...>::operator bool() const
 {
-	return m_initialized;
+	return IsInitialized();
 }
 
 #include <Nazara/Core/DebugOff.hpp>