Fix small memory leaks on shutdown

sapier · sapier · commit e81454fb387c · 2014-06-20T19:50:47.000+02:00
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
@@ -205,8 +205,9 @@ GUIEngine::GUIEngine(	irr::IrrlichtDevice* dev,
 	}
 
 	m_menu->quitMenu();
-	m_menu->drop();
-	m_menu = 0;
+	m_menu->remove();
+	delete m_menu;
+	m_menu = NULL;
 }
 
 /******************************************************************************/
@@ -279,8 +280,6 @@ GUIEngine::~GUIEngine()
 		m_sound_manager = NULL;
 	}
 
-	//TODO: clean up m_menu here
-
 	infostream<<"GUIEngine: Deinitializing scripting"<<std::endl;
 	delete m_script;
 
diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp
@@ -102,6 +102,11 @@ GUIFormSpecMenu::GUIFormSpecMenu(irr::IrrlichtDevice* dev,
 GUIFormSpecMenu::~GUIFormSpecMenu()
 {
 	removeChildren();
+	
+	for (u32 i = 0; i < m_tables.size(); ++i) {
+		GUITable *table = m_tables[i].second;
+		table->drop();
+	}
 
 	delete m_selected_item;
 
diff --git a/src/guiTable.cpp b/src/guiTable.cpp
@@ -98,6 +98,8 @@ GUITable::~GUITable()
 
 	if (m_font)
 		m_font->drop();
+	
+	m_scrollbar->remove();
 }
 
 GUITable::Option GUITable::splitOption(const std::string &str)

Original file line number	Diff line number	Diff line change
`@@ -205,8 +205,9 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev,`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`m_menu->quitMenu();`
`208`		`- m_menu->drop();`
`209`		`- m_menu = 0;`
	`208`	`+ m_menu->remove();`
	`209`	`+ delete m_menu;`
	`210`	`+ m_menu = NULL;`
`210`	`211`	`}`
`211`	`212`
`212`	`213`	`/******************************************************************************/`
`@@ -279,8 +280,6 @@ GUIEngine::~GUIEngine()`
`279`	`280`	`m_sound_manager = NULL;`
`280`	`281`	`}`
`281`	`282`
`282`		`- //TODO: clean up m_menu here`
`283`		`-`
`284`	`283`	`infostream<<"GUIEngine: Deinitializing scripting"<<std::endl;`
`285`	`284`	`delete m_script;`
`286`	`285`
Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,8 @@ GUITable::~GUITable()`
`98`	`98`
`99`	`99`	`if (m_font)`
`100`	`100`	`m_font->drop();`
	`101`	`+`
	`102`	`+ m_scrollbar->remove();`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`GUITable::Option GUITable::splitOption(const std::string &str)`