Fixed a crash: the singleton needs to be instantiated the first time SGCommandMgr...

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

diff --git a/simgear/props/propertyObject.cxx b/simgear/props/propertyObject.cxx
index ff87898e68c8e3841a612a6cb4519b273de544a6..7a46056080ea67b153c27d53d4628d4c2abbd8cf 100644 (file)
--- a/simgear/props/propertyObject.cxx
+++ b/simgear/props/propertyObject.cxx
@@ -21,8 +21,6 @@
 
 #include "propertyObject.hxx"
 
-#include <simgear/math/SGMath.hxx>
-
 #include <simgear/structure/exception.hxx>
 
 namespace simgear
@@ -68,15 +66,17 @@ SGPropertyNode* PropertyObjectBase::node(bool aCreate) const
     return _prop;
   }
   
-  SGPropertyNode* r = _prop ? _prop : static_defaultRoot;
-  _prop = r->getNode(_path, aCreate);
+  SGPropertyNode *r = _prop ? _prop : static_defaultRoot,
+                 *prop = r->getNode(_path, aCreate);
   
-  if (_prop) {
-    // resolve worked, we will cache from now on, so clear _path
+  if( prop )
+  {
+    // resolve worked, we will cache from now on, so clear _path and cache prop
     _path = NULL;
+    _prop = prop;
   }
 
-  return _prop;
+  return prop;
 }
 
 SGPropertyNode* PropertyObjectBase::getOrThrow() const