1 files changed, 6 insertions, 0 deletions
diff --git a/src/guichan/widgets/tabbedarea.cpp b/src/guichan/widgets/tabbedarea.cpp
index d430a76a3..26a45c1f0 100644
--- a/src/guichan/widgets/tabbedarea.cpp
+++ b/src/guichan/widgets/tabbedarea.cpp
@@ -81,10 +81,15 @@ namespace gcn
         remove(mWidgetContainer);
 
         delete mTabContainer;
+        mTabContainer = 0;
         delete mWidgetContainer;
+        mWidgetContainer = 0;
 
         for (unsigned int i = 0; i < mTabsToDelete.size(); i++)
+        {
             delete mTabsToDelete[i];
+            mTabsToDelete[i] = 0;
+        }
     }
 
     void TabbedArea::addTab(const std::string& caption, Widget* widget)
@@ -163,6 +168,7 @@ namespace gcn
             {
                 mTabsToDelete.erase(iter2);
                 delete tab;
+                tab = 0;
                 break;
             }
         }