Fix small memory leaks on shutdown

diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp
index 671f0c574dbd91fd7ac31e65744a1bc1329f272d..34bdaffad23ee6e6e6a2723a9bf5a8c4c45b50fb 100644 (file)
--- 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
index f69f1b9a5496a92dc0a91b1996d49ea5c48aacda..6073ed7ccb9fcc27a3211a1e7a88362092652bf1 100644 (file)
--- 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
index 5febb8370fd0a93aebe66bd19a09ce54cd4b442e..4d6fc195072add988769a3601c1cfa41512eee09 100644 (file)
--- 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)