Try to avoid some memory leaks.

diff --git a/simgear/sky/cloud.cxx b/simgear/sky/cloud.cxx
index 4c37a17a96994351852dfa6617e388390960f694..cae48fdbbd49bcf088611da7741b9b1d5f69a504 100644 (file)
--- a/simgear/sky/cloud.cxx
+++ b/simgear/sky/cloud.cxx
@@ -46,11 +46,13 @@ SGCloudLayer::SGCloudLayer( const string &tex_path )
     layer_transition(0),
     layer_type(SG_CLOUD_CLEAR)
 {
     layer_transition(0),
     layer_type(SG_CLOUD_CLEAR)
 {

-  rebuild();
+    rebuild();

 }
 
 // Destructor
 }
 
 // Destructor

-SGCloudLayer::~SGCloudLayer( void ) {
+SGCloudLayer::~SGCloudLayer()
+{
+    delete layer_root;

 }
 
 float
 }
 
 float


@@ -62,7 +64,10 @@ SGCloudLayer::getSpan_m () const
 void
 SGCloudLayer::setSpan_m (float span_m)
 {
 void
 SGCloudLayer::setSpan_m (float span_m)
 {

-    layer_span = span_m;
+    if (span_m != layer_span) {
+       layer_span = span_m;
+       rebuild();
+    }

 }
 
 float
 }
 
 float


@@ -110,8 +115,10 @@ SGCloudLayer::getType () const
 void
 SGCloudLayer::setType (Type type)
 {
 void
 SGCloudLayer::setType (Type type)
 {

-    layer_type = type;
-    rebuild();
+    if (type != layer_type) {
+       layer_type = type;
+       rebuild();
+    }

 }
 
 
 }
 
 


@@ -143,7 +150,11 @@ SGCloudLayer::rebuild()
       layer_states[SG_CLOUD_CLEAR] = 0;
     }
 
       layer_states[SG_CLOUD_CLEAR] = 0;
     }
 

+                               // This should automatically delete
+                               // layer_transform as well.

     delete layer_root;
     delete layer_root;

+    layer_root = 0;
+    layer_transform = 0;

 
     scale = 4000.0;
 
 
     scale = 4000.0;