[Orxonox-commit 2206] r6922 - code/branches/hudelements/src/modules/overlays/hud

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2010-05-18 09:34:53 +0200 (Tue, 18 May 2010)
New Revision: 6922

Modified:
   code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
Log:
Fixed bug in HUDNavigation destructor again.

Modified: code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-17 15:01:54 UTC (rev 6921)
+++ code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc	2010-05-18 07:34:53 UTC (rev 6922)
@@ -94,20 +94,17 @@
     
 }
 
-HUDNavigation::~HUDNavigation() {
-
+HUDNavigation::~HUDNavigation()
+{
     if (this->isInitialized())
     {
-        activeObjectListType::iterator it;
-        for( it = activeObjectList_.begin(); it!=activeObjectList_.end(); ++it )
-        {
-            removeObject(it->first);
-        }
-        activeObjectList_.clear();
+        for (activeObjectListType::iterator it = activeObjectList_.begin(); it != activeObjectList_.end();)
+            removeObject((it++)->first);
     }
 }
 
-void HUDNavigation::XMLPort(Element& xmlElement, XMLPort::Mode mode) {
+void HUDNavigation::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+{
     SUPER(HUDNavigation, XMLPort, xmlElement, mode);
 
     XMLPortParam(HUDNavigation, "font",     setFont,     getFont,     xmlElement, mode);