Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Environment / terrainsampler.cxx

diff --git a/src/Environment/terrainsampler.cxx b/src/Environment/terrainsampler.cxx
index d3a0e713845f8d230f66c28f3cfa27a170b123e4..b4a7beabf5a738174d63eaf4a578eb6d8b081bb6 100644 (file)
--- a/src/Environment/terrainsampler.cxx
+++ b/src/Environment/terrainsampler.cxx
@@ -30,7 +30,12 @@
 #include <deque>
 
 #include "terrainsampler.hxx"
+
 using simgear::PropertyList;
+using std::deque;
+using std::vector;
+using std::ostringstream;
+using std::string;
 
 #include <simgear/props/tiedpropertylist.hxx>
 
@@ -366,6 +371,7 @@ void TerrainSamplerImplementation::reinit()
         if( subsys == NULL )
             break;
         remove_subsystem( subsystemName );
+        subsys->unbind();
         delete subsys;
     }