From b1855b34c6b1c80e6163d0a2e98c555222fc36f3 Mon Sep 17 00:00:00 2001
From: jmt <jmt>
Date: Sat, 13 Mar 2010 12:21:51 +0000
Subject: [PATCH] Syd Adams: only define overspeed-indicator properties when
 enabled.

---
 src/Instrumentation/airspeed_indicator.cxx | 44 +++++++++++-----------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/Instrumentation/airspeed_indicator.cxx b/src/Instrumentation/airspeed_indicator.cxx
index 3fb9aa655..0d59ffcf3 100644
--- a/src/Instrumentation/airspeed_indicator.cxx
+++ b/src/Instrumentation/airspeed_indicator.cxx
@@ -41,29 +41,31 @@ AirspeedIndicator::init ()
     _static_pressure_node = fgGetNode(_static_pressure.c_str(), true);
     _density_node = fgGetNode("/environment/density-slugft3", true);
     _speed_node = node->getChild("indicated-speed-kt", 0, true);
-    
+
   // overspeed-indicator properties
-    _ias_limit_node = node->getNode("ias-limit",0, true);
-    _mach_limit_node = node->getNode("mach-limit",0, true);
-    _alt_threshold_node = node->getNode("alt-threshold",0, true);
-    _airspeed_limit = node->getChild("airspeed-limit-kt", 0, true);
-    
-    if (!_ias_limit_node->hasValue()) {
-      _ias_limit_node->setDoubleValue(250.0);
-    }
-    
-    if (!_mach_limit_node->hasValue()) {
-      _mach_limit_node->setDoubleValue(0.48);
-    }
-    
-    if (!_alt_threshold_node->hasValue()) {
-      _alt_threshold_node->setDoubleValue(13200);
+    if (_has_overspeed) {
+        _ias_limit_node = node->getNode("ias-limit",0, true);
+        _mach_limit_node = node->getNode("mach-limit",0, true);
+        _alt_threshold_node = node->getNode("alt-threshold",0, true);
+        _airspeed_limit = node->getChild("airspeed-limit-kt", 0, true);
+
+        if (!_ias_limit_node->hasValue()) {
+          _ias_limit_node->setDoubleValue(248.0);
+        }
+
+        if (!_mach_limit_node->hasValue()) {
+          _mach_limit_node->setDoubleValue(0.48);
+        }
+
+        if (!_alt_threshold_node->hasValue()) {
+          _alt_threshold_node->setDoubleValue(13200);
+        }
+
+        string paSource = node->getStringValue("pressure-alt-source",
+          "/instrumentation/altimeter/pressure-alt-ft");
+        _pressure_alt = fgGetNode(paSource.c_str(), true);
+        _mach = fgGetNode("/velocities/mach", true);
     }
-    
-    string paSource = node->getStringValue("pressure-alt-source",
-      "/instrumentation/altimeter/pressure-alt-ft");
-    _pressure_alt = fgGetNode(paSource.c_str(), true);
-    _mach = fgGetNode("/velocities/mach", true);
 }
 
 #ifndef FPSTOKTS
-- 
2.39.5