Fix issues related to #419.

diff --git a/src/Environment/terrainsampler.cxx b/src/Environment/terrainsampler.cxx
index c2f928350662d455ed166c91502e5cca0f4b07f4..b4a7beabf5a738174d63eaf4a578eb6d8b081bb6 100644 (file)
--- a/src/Environment/terrainsampler.cxx
+++ b/src/Environment/terrainsampler.cxx
@@ -371,6 +371,7 @@ void TerrainSamplerImplementation::reinit()
         if( subsys == NULL )
             break;
         remove_subsystem( subsystemName );
+        subsys->unbind();
         delete subsys;
     }
     

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index f17459e8ae7c436c94750fa45b58d98ec68393e3..d4e8c0f48ac1a9dc444c121f760aa5ade5724cab 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -55,6 +55,8 @@ FGAircraftModel::FGAircraftModel ()
 
 FGAircraftModel::~FGAircraftModel ()
 {
+  // drop reference
+  _fx = 0;
   deinit();
 }
 
@@ -91,9 +93,6 @@ FGAircraftModel::reinit()
 void
 FGAircraftModel::deinit()
 {
-  // drop reference
-  _fx = 0;
-
   if (!_aircraft) {
     return;
   }