From: david <david>
Date: Thu, 18 Jul 2002 20:04:50 +0000 (+0000)
Subject: Quick fix for bug reported by Julian Foad, where the simplify flag was
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=cadefd323a62f67897adef1b91ba90b67036cb0f;p=simgear.git

Quick fix for bug reported by Julian Foad, where the simplify flag was
not honoured after the first call.  This isn't all that efficient, and
the return type probably should change to string eventually, but this
fix avoids changing the headers for now.
---

diff --git a/simgear/misc/props.cxx b/simgear/misc/props.cxx
index 39db0462..ca4bb528 100644
--- a/simgear/misc/props.cxx
+++ b/simgear/misc/props.cxx
@@ -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;
 }