Bugfix: don't crash on localizers with no associated runway (due to inconsistent...

[flightgear.git] / src / Instrumentation / instrument_mgr.cxx

diff --git a/src/Instrumentation/instrument_mgr.cxx b/src/Instrumentation/instrument_mgr.cxx
index 380ccd2ee8bae6dbae57b02ace3ebc969a2e675b..6bfecbb270968d540253735f1fd426cddf07c9ca 100644 (file)
--- a/src/Instrumentation/instrument_mgr.cxx
+++ b/src/Instrumentation/instrument_mgr.cxx
@@ -57,7 +57,7 @@ FGInstrumentMgr::FGInstrumentMgr () :
     set_subsystem("od_gauge", new FGODGauge);
     set_subsystem("hud", new HUD);
 
-    config_props = new SGPropertyNode;
+    SGPropertyNode_ptr config_props = new SGPropertyNode;
 
     SGPropertyNode *path_n = fgGetNode("/sim/instrumentation/path");
 
@@ -70,7 +70,7 @@ FGInstrumentMgr::FGInstrumentMgr () :
         try {
             readProperties( config.str(), config_props );
 
-            if ( !build() ) {
+            if ( !build(config_props) ) {
                 throw sg_error(
                     "Detected an internal inconsistency in the instrumentation\n"
                     "system specification file.  See earlier errors for details.");
@@ -85,8 +85,6 @@ FGInstrumentMgr::FGInstrumentMgr () :
                 "No instrumentation model specified for this model!");
     }
 
-    delete config_props;
-    
     if (!_explicitGps) {
       SG_LOG(SG_INSTR, SG_INFO, "creating default GPS instrument");
       SGPropertyNode_ptr nd(new SGPropertyNode);
@@ -100,7 +98,7 @@ FGInstrumentMgr::~FGInstrumentMgr ()
 {
 }
 
-bool FGInstrumentMgr::build ()
+bool FGInstrumentMgr::build (SGPropertyNode* config_props)
 {
     for ( int i = 0; i < config_props->nChildren(); ++i ) {
         SGPropertyNode *node = config_props->getChild(i);