- catch exception from readProperties and exit

[flightgear.git] / src / FDM / JSBSim.cxx

diff --git a/src/FDM/JSBSim.cxx b/src/FDM/JSBSim.cxx
index c3fa97bf123de300d7f102a030468cdee2e41ca0..dc308ffd5e95b2d65882727f54cbfd0f8aa30c03 100644 (file)
--- a/src/FDM/JSBSim.cxx
+++ b/src/FDM/JSBSim.cxx
@@ -95,6 +95,16 @@ FGJSBsim::FGJSBsim( double dt )
                                engine_path.str(),
                                fgGetString("/sim/aircraft") );
     
+
+    if (result) {
+       SG_LOG( SG_FLIGHT, SG_INFO,
+               "  loaded aircraft.");
+    } else {
+       SG_LOG( SG_FLIGHT, SG_INFO,
+               "  aircraft does not exist (you may have mis-typed the name).");
+       throw(-1);
+    }
+
     int Neng = Propulsion->GetNumEngines();
     SG_LOG(SG_FLIGHT,SG_INFO, "Neng: " << Neng );
     
@@ -120,9 +130,9 @@ FGJSBsim::FGJSBsim( double dt )
 
 /******************************************************************************/
 FGJSBsim::~FGJSBsim(void) {
-    if(fdmex != NULL) {
-        delete fdmex;
-        delete fgic;
+    if (fdmex != NULL) {
+        delete fdmex; fdmex=NULL;
+        delete fgic; fgic=NULL;
     }  
 }