Really fix itemdef memory leak

minetest · May 9, 2013 · ee1155f · ee1155f
1 parent 3b1c3ac
commit ee1155f
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
@@ -226,17 +226,11 @@ class CItemDefManager: public IWritableItemDefManager
 public:
 	CItemDefManager()
 	{
-		for (std::map<std::string, ItemDefinition*>::iterator iter =
-				m_item_definitions.begin(); iter != m_item_definitions.end();
-				iter ++) {
-			delete iter->second;
-		}
-		m_item_definitions.clear();
+
 #ifndef SERVER
 		m_main_thread = get_current_thread_id();
 		m_driver = NULL;
 #endif
-
 		clear();
 	}
 	virtual ~CItemDefManager()
@@ -260,6 +254,12 @@ class CItemDefManager: public IWritableItemDefManager
 		}
 		m_driver = NULL;
 #endif
+		for (std::map<std::string, ItemDefinition*>::iterator iter =
+				m_item_definitions.begin(); iter != m_item_definitions.end();
+				iter ++) {
+			delete iter->second;
+		}
+		m_item_definitions.clear();
 	}
 	virtual const ItemDefinition& get(const std::string &name_) const
 	{