Fixed calling Uninitialize when not Initialized

Former-commit-id: 1d0bb01f881be76e163a5ac27c91d7fb6a873bb7
2012-12-08 21:51:43 +01:00
parent cc132e271b
commit dc9f202155
7 changed files with 70 additions and 16 deletions
--- a/src/Nazara/Utility/Utility.cpp
+++ b/src/Nazara/Utility/Utility.cpp
@@ -78,10 +78,18 @@ bool NzUtility::IsInitialized()

 void NzUtility::Uninitialize()
 {
-	if (--s_moduleReferenceCounter != 0)
-		return; // Encore utilisé
+	if (s_moduleReferenceCounter != 1)
+	{
+		// Le module est soit encore utilisé, soit pas initialisé
+		if (s_moduleReferenceCounter > 1)
+			s_moduleReferenceCounter--;
+
+		return;
+	}

 	// Libération du module
+	s_moduleReferenceCounter = 0;
+
 	NzLoaders_MD2_Unregister();
 	NzLoaders_MD5Mesh_Unregister();
 	NzLoaders_PCX_Unregister();