From 0f033eaed974eb3a5b54b1b9ee66a4b572aab38f Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sun, 4 Jan 2015 18:57:01 +0100
Subject: [PATCH] Added CallOnExit::CallAndReset()

Former-commit-id: 045ff61445203999757971deeeafee719fc5506a
---
 include/Nazara/Core/CallOnExit.hpp | 1 +
 include/Nazara/Core/CallOnExit.inl | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/include/Nazara/Core/CallOnExit.hpp b/include/Nazara/Core/CallOnExit.hpp
index 3f8fc1f2f..45ea2622d 100644
--- a/include/Nazara/Core/CallOnExit.hpp
+++ b/include/Nazara/Core/CallOnExit.hpp
@@ -19,6 +19,7 @@ class NzCallOnExit : NzNonCopyable
 		NzCallOnExit(Func func = nullptr);
 		~NzCallOnExit();
 
+		void CallAndReset(Func func = nullptr);
 		void Reset(Func func = nullptr);
 
 	private:
diff --git a/include/Nazara/Core/CallOnExit.inl b/include/Nazara/Core/CallOnExit.inl
index 00960f3ac..fd7f4de80 100644
--- a/include/Nazara/Core/CallOnExit.inl
+++ b/include/Nazara/Core/CallOnExit.inl
@@ -2,6 +2,7 @@
 // This file is part of the "Nazara Engine - Core module"
 // For conditions of distribution and use, see copyright notice in Config.hpp
 
+#include <Nazara/Core/Error.hpp>
 #include <Nazara/Core/Debug.hpp>
 
 inline NzCallOnExit::NzCallOnExit(Func func) :
@@ -15,6 +16,14 @@ inline NzCallOnExit::~NzCallOnExit()
 		m_func();
 }
 
+inline void NzCallOnExit::CallAndReset(Func func)
+{
+	if (m_func)
+		m_func();
+
+	Reset(func);
+}
+
 inline void NzCallOnExit::Reset(Func func)
 {
 	m_func = func;