From 596c3e5d03fad59d8ae9b06954a3c3c20307bc82 Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Mon, 19 Dec 2011 21:36:42 +0100
Subject: [PATCH] Fix issues related to #419.

---
 src/Environment/terrainsampler.cxx | 1 +
 src/Model/acmodel.cxx              | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Environment/terrainsampler.cxx b/src/Environment/terrainsampler.cxx
index c2f928350..b4a7beabf 100644
--- 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 f17459e8a..d4e8c0f48 100644
--- 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;
   }
-- 
2.39.5