A couple more sanity checking tweaks for texture freeing.

diff --git a/simgear/screen/texture.cxx b/simgear/screen/texture.cxx
index 62e8c74b11f9d6f35bfff2a823bcd068a3d848db..338fd113a818c17dfd8454fadd2807478dcbad4c 100644 (file)
--- a/simgear/screen/texture.cxx
+++ b/simgear/screen/texture.cxx
@@ -35,11 +35,13 @@ SGTexture::SGTexture(unsigned int width, unsigned int height)
 
 SGTexture::~SGTexture()
 {
-    if (texture_data)
+    if ( texture_data ) {
         delete texture_data;
+    }
 
-    if (texture_id)
+    if ( texture_id >= 0 ) {
         free_id();
+    }
 }
 
 void

diff --git a/simgear/screen/texture.hxx b/simgear/screen/texture.hxx
index 71609c5093d16ce7c9348e80e1273b65a50c7cd8..083c6036d47f57861e569c3b95f7b4f78feadf3b 100644 (file)
--- a/simgear/screen/texture.hxx
+++ b/simgear/screen/texture.hxx
@@ -67,6 +67,7 @@ protected:
 #else
         glDeleteTexturesEXT(1, &texture_id);
 #endif
+        texture_id = -1;
     }