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 621d11db67efd2401ad43c049d22e59505917261..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();
@@ -139,7 +140,6 @@ namespace simgear
     }
 
     PropertyBasedElementPtr el = _element_factory(child);
-    el->setSelf( el );
     _elements[index] = el;
     elementCreated( el );
   }