Patch from Cameron Moore:

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

diff --git a/simgear/misc/props.cxx b/simgear/misc/props.cxx
index 39db0462c03ec1d7d5f7017bd54d17c648ee83fc..0af19b435799e79f54772a974c9ae617276d069c 100644 (file)
--- a/simgear/misc/props.cxx
+++ b/simgear/misc/props.cxx
@@ -652,8 +652,8 @@ SGPropertyNode::SGPropertyNode ()
  * Copy constructor.
  */
 SGPropertyNode::SGPropertyNode (const SGPropertyNode &node)
-  : _index(node._index),
-    _display_name(0),
+  : _display_name(0),
+    _index(node._index),
     _parent(0),                        // don't copy the parent
     _path(0),
     _path_cache(0),
@@ -938,15 +938,13 @@ SGPropertyNode::removeChild (const char * name, int index, bool keep)
 const char *
 SGPropertyNode::getDisplayName (bool simplify) const
 {
-  if (_display_name == 0) {
-    string display = _name;
-    if (_index != 0 || !simplify) {
-      char buffer[64];
-      sprintf(buffer, "[%d]", _index);
-      display += buffer;
-    }
-    _display_name = copy_string(display.c_str());
+  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;
 }