Patch from Cameron Moore:

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

diff --git a/simgear/misc/props.cxx b/simgear/misc/props.cxx
index 7da884a70e4638d489527b8c18d8cf555c053ead..0af19b435799e79f54772a974c9ae617276d069c 100644 (file)
--- a/simgear/misc/props.cxx
+++ b/simgear/misc/props.cxx
@@ -633,6 +633,7 @@ const int SGPropertyNode::LAST_USED_ATTRIBUTE = TRACE_WRITE;
  */
 SGPropertyNode::SGPropertyNode ()
   : _name(copy_string("")),
+    _display_name(0),
     _index(0),
     _parent(0),
     _path(0),
@@ -651,7 +652,8 @@ SGPropertyNode::SGPropertyNode ()
  * Copy constructor.
  */
 SGPropertyNode::SGPropertyNode (const SGPropertyNode &node)
-  : _index(node._index),
+  : _display_name(0),
+    _index(node._index),
     _parent(0),                        // don't copy the parent
     _path(0),
     _path_cache(0),
@@ -735,7 +737,8 @@ SGPropertyNode::SGPropertyNode (const SGPropertyNode &node)
 SGPropertyNode::SGPropertyNode (const char * name,
                                int index,
                                SGPropertyNode * parent)
-  : _index(index),
+  : _display_name(0),
+    _index(index),
     _parent(parent),
     _path(0),
     _path_cache(0),
@@ -756,7 +759,8 @@ SGPropertyNode::SGPropertyNode (const char * name,
 SGPropertyNode::~SGPropertyNode ()
 {
   delete [] _name;
-  delete _path;
+  delete [] _display_name;
+  delete [] _path;
   delete _path_cache;
   clear_value();
   delete _listeners;
@@ -931,6 +935,20 @@ SGPropertyNode::removeChild (const char * name, int index, bool keep)
 }
 
 
+const char *
+SGPropertyNode::getDisplayName (bool simplify) const
+{
+  string display = _name;
+  if (_index != 0 || !simplify) {
+    char buffer[64];
+    sprintf(buffer, "[%d]", _index);
+    display += buffer;
+  }
+  _display_name = copy_string(display.c_str());
+  return _display_name;
+}
+
+
 const char *
 SGPropertyNode::getPath (bool simplify) const
 {
@@ -942,12 +960,7 @@ SGPropertyNode::getPath (bool simplify) const
     } else {
       path = _parent->getPath(simplify);
       path += '/';
-      path += _name;
-      if (_index != 0 || !simplify) {
-       char buffer[64];
-       sprintf(buffer, "[%d]", _index);
-       path += buffer;
-      }
+      path += getDisplayName(simplify);
     }
     _path = copy_string(path.c_str());
   }