Fixed crash when reading project file with non-existing raster file

homann · homann · commit 4565a7be6cd9 · 2008-01-12T08:53:32.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7936 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -423,8 +423,11 @@ QgsRasterLayer::~QgsRasterLayer()
 
   if (mProviderKey.isEmpty())
   {
-    mGdalBaseDataset->Dereference();
-    GDALClose(mGdalDataset);
+    if ( mGdalBaseDataset )
+    {
+      mGdalBaseDataset->Dereference();
+      GDALClose(mGdalDataset);
+    }
   }  
 }
 

Original file line number	Diff line number	Diff line change
`@@ -423,8 +423,11 @@ QgsRasterLayer::~QgsRasterLayer()`
`423`	`423`
`424`	`424`	`if (mProviderKey.isEmpty())`
`425`	`425`	`{`
`426`		`- mGdalBaseDataset->Dereference();`
`427`		`- GDALClose(mGdalDataset);`
	`426`	`+ if ( mGdalBaseDataset )`
	`427`	`+ {`
	`428`	`+ mGdalBaseDataset->Dereference();`
	`429`	`+ GDALClose(mGdalDataset);`
	`430`	`+ }`
`428`	`431`	`}`
`429`	`432`	`}`
`430`	`433`