fix #2810

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15717 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Apr 15, 2011 · b75c1b3 · b75c1b3
1 parent 7ba1fbe
commit b75c1b3
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -521,21 +521,37 @@ void QgsRasterLayerProperties::sync()
 
   if ( mRasterLayer->dataProvider()->dataType( 1 ) == QgsRasterDataProvider::ARGBDataType )
   {
-    delete tabPageSymbology;
-    delete tabPageColormap;
+    if ( tabPageSymbology != NULL )
+    {
+      delete tabPageSymbology;
+      tabPageSymbology = NULL;
+    }
+    if ( tabPageColormap != NULL )
+    {
+      delete tabPageColormap;
+      tabPageColormap = NULL;
+    }
     gboxNoDataValue->setEnabled( false );
     gboxCustomTransparency->setEnabled( false );
     tabBar->setCurrentWidget( tabPageMetadata );
   }
 
   if ( !( mRasterLayer->dataProvider()->capabilities() & QgsRasterDataProvider::BuildPyramids ) )
   {
-    delete tabPagePyramids;
+    if ( tabPagePyramids != NULL )
+    {
+      delete tabPagePyramids;
+      tabPagePyramids = NULL;
+    }
   }
 
   if ( !( mRasterLayer->dataProvider()->capabilities() & QgsRasterDataProvider::Histogram ) )
   {
-    delete tabPageHistogram;
+    if ( tabPageHistogram != NULL )
+    {
+      delete tabPageHistogram;
+      tabPageHistogram = NULL;
+    }
   }
 
 #if 0