Changeset 6922 for code/branches

Timestamp:

May 18, 2010, 9:34:53 AM (15 years ago)

Author:

rgrieder

Message:

Fixed bug in HUDNavigation destructor again.

File:

• code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc (modified) (1 diff)

code/branches/hudelements/src/modules/overlays/hud/HUDNavigation.cc

@@ -95 +95 @@
 }
 
-HUDNavigation::~HUDNavigation() {
-
+HUDNavigation::~HUDNavigation()
+{
     if (this->isInitialized())
     {
-        activeObjectListType::iterator it;
-        for( it = activeObjectList_.begin(); it!=activeObjectList_.end(); ++it )
-        {
-            removeObject(it->first);
-        }
-        activeObjectList_.clear();
-    }
-}
-
-void HUDNavigation::XMLPort(Element& xmlElement, XMLPort::Mode mode) {
+        for (activeObjectListType::iterator it = activeObjectList_.begin(); it != activeObjectList_.end();)
+            removeObject((it++)->first);
+    }
+}
+
+void HUDNavigation::XMLPort(Element& xmlElement, XMLPort::Mode mode)
+{
     SUPER(HUDNavigation, XMLPort, xmlElement, mode);