Fix #1783: repeated error message on console

[simgear.git] / simgear / props / PropertyBasedMgr.cxx

diff --git a/simgear/props/PropertyBasedMgr.cxx b/simgear/props/PropertyBasedMgr.cxx
index 46f3c736d0bad49a08f81d623eb6f8710cedb8cf..c133d1522a74b17111c449dcf3db0f6a2aa1cb98 100644 (file)
--- a/simgear/props/PropertyBasedMgr.cxx
+++ b/simgear/props/PropertyBasedMgr.cxx
@@ -36,6 +36,7 @@ namespace simgear
   //----------------------------------------------------------------------------
   void PropertyBasedMgr::shutdown()
   {
+    _props->removeAllChildren();
     _props->removeChangeListener(this);
   }
 
@@ -75,7 +76,7 @@ namespace simgear
       return PropertyBasedElementPtr();
 
     BOOST_FOREACH(PropertyBasedElementPtr el, _elements)
-      if( el->getProps()->getStringValue("name") == name )
+      if( el && el->getProps()->getStringValue("name") == name )
         return el;
 
     return PropertyBasedElementPtr();
@@ -126,6 +127,7 @@ namespace simgear
       _elements.resize(index + 1);
     }
     else if( _elements[index] )
+    {
       SG_LOG
       (
         SG_GENERAL,
@@ -133,8 +135,11 @@ namespace simgear
         _name_elements << "[" << index << "] already exists!"
       );
 
+      // Give anything holding a reference to this element to release it
+      _elements[index]->onDestroy();
+    }
+
     PropertyBasedElementPtr el = _element_factory(child);
-    el->setSelf( el );
     _elements[index] = el;
     elementCreated( el );
   }
@@ -158,8 +163,11 @@ namespace simgear
         "can't removed unknown " << _name_elements << "[" << index << "]!"
       );
     else
+    {
       // remove the element...
+      _elements[index]->onDestroy();
       _elements[index].reset();
+    }
   }
 
 } // namespace simgear