Merge branch 'master' of https://github.com/minetest/minetest

1 files changed, 6 insertions, 10 deletions

diff --git a/src/inventory.cpp b/src/inventory.cpp
index fc1aaf371..da6517e62 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -460,7 +460,6 @@ void InventoryList::deSerialize(std::istream &is)
 		std::getline(is, line, '\n');
 
 		std::istringstream iss(line);
-		//iss.imbue(std::locale("C"));
 
 		std::string name;
 		std::getline(iss, name, ' ');
@@ -938,19 +937,16 @@ void Inventory::deSerialize(std::istream &is)
 InventoryList * Inventory::addList(const std::string &name, u32 size)
 {
 	setModified();
+
+	// Remove existing lists
 	s32 i = getListIndex(name);
-	if(i != -1)
-	{
-		if(m_lists[i]->getSize() != size)
-		{
-			delete m_lists[i];
-			m_lists[i] = new InventoryList(name, size, m_itemdef);
-			m_lists[i]->setModified();
-		}
+	if (i != -1) {
+		delete m_lists[i];
+		m_lists[i] = new InventoryList(name, size, m_itemdef);
+		m_lists[i]->setModified();
 		return m_lists[i];
 	}
 
-
 	//don't create list with invalid name
 	if (name.find(' ') != std::string::npos)
 		return nullptr;