From 969fbb189d16d87d26ceab29795644588fb90a32 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 21 May 2011 11:07:03 +0300
Subject: All textures are are now searched first from the directory specified
 by the texture_path setting.

---
 src/utility.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/utility.h')

diff --git a/src/utility.h b/src/utility.h
index 84838c0c7..cc8891a07 100644
--- a/src/utility.h
+++ b/src/utility.h
@@ -1766,12 +1766,12 @@ private:
 	core::list<Value> m_list;
 };
 
-#if 0
+#if 1
 template<typename Key, typename Value>
-class MutexedCache
+class MutexedMap
 {
 public:
-	MutexedCache()
+	MutexedMap()
 	{
 		m_mutex.Init();
 		assert(m_mutex.IsInitialized());
@@ -1793,8 +1793,10 @@ public:
 
 		if(n == NULL)
 			return false;
-
-		*result = n->getValue();
+		
+		if(result != NULL)
+			*result = n->getValue();
+			
 		return true;
 	}
 
-- 
cgit v1.2.3