FGSystemMgr: Do not quit on unknown system.

Showing a warning should be enough...

diff --git a/src/Systems/system_mgr.cxx b/src/Systems/system_mgr.cxx
index 252ce543875a03a29767b0bd47e29dbe4b224778..4661b338886b47e73f6ae2f7d61895fe26c71b46 100644 (file)
--- a/src/Systems/system_mgr.cxx
+++ b/src/Systems/system_mgr.cxx
@@ -39,23 +39,15 @@ FGSystemMgr::FGSystemMgr ()
 
         SG_LOG( SG_SYSTEMS, SG_INFO, "Reading systems from "
                 << config.str() );
-        try {
-            readProperties( config.str(), config_props );
-
-            if ( build(config_props) ) {
-                enabled = true;
-            } else {
-                SG_LOG( SG_SYSTEMS, SG_ALERT,
-                        "Detected an internal inconsistency in the systems");
-                SG_LOG( SG_SYSTEMS, SG_ALERT,
-                        " system specification file.  See earlier errors for" );
-                SG_LOG( SG_SYSTEMS, SG_ALERT,
-                        " details.");
-                exit(-1);
-            }        
-        } catch (const sg_exception&) {
-            SG_LOG( SG_SYSTEMS, SG_ALERT, "Failed to load systems system model: "
-                    << config.str() );
+        try
+        {
+          readProperties( config.str(), config_props );
+          build(config_props);
+        }
+        catch( const sg_exception& )
+        {
+          SG_LOG( SG_SYSTEMS, SG_ALERT, "Failed to load systems system model: "
+                  << config.str() );
         }
 
     } else {
@@ -93,9 +85,7 @@ bool FGSystemMgr::build (SGPropertyNode* config_props)
             set_subsystem( "system" + temp.str(), 
                            new VacuumSystem( node ) );
         } else {
-            SG_LOG( SG_SYSTEMS, SG_ALERT, "Unknown top level section: " 
-                    << name );
-            return false;
+            SG_LOG(SG_SYSTEMS, SG_ALERT, "Ignoring unknown system: " << name);
         }
     }
     return true;

diff --git a/src/Systems/system_mgr.hxx b/src/Systems/system_mgr.hxx
index a6260a531d921d3213c1cee94b63666ef16be58b..ca5d64fa3690cd9642e0106f9fb5f7ee4d23db80 100644 (file)
--- a/src/Systems/system_mgr.hxx
+++ b/src/Systems/system_mgr.hxx
@@ -33,9 +33,6 @@ public:
     virtual ~FGSystemMgr ();
     bool build (SGPropertyNode* config_props);
 
-private:
-    bool enabled;
-
 };
 
 #endif // __SYSTEM_MGR_HXX