make QgsMapLayerRegistry::addLayer() a bit more robust

jef · jef · commit 04e023c91bec · 2009-11-07T16:51:31.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@11961 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsmaplayerregistry.cpp b/src/core/qgsmaplayerregistry.cpp
@@ -66,7 +66,7 @@ QgsMapLayer * QgsMapLayerRegistry::mapLayer( QString theLayerId )
 QgsMapLayer *
 QgsMapLayerRegistry::addMapLayer( QgsMapLayer * theMapLayer, bool theEmitSignal )
 {
-  if ( !theMapLayer->isValid() )
+  if ( !theMapLayer || !theMapLayer->isValid() )
   {
     QgsDebugMsg( "cannot add invalid layers" );
     return 0;

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ QgsMapLayer * QgsMapLayerRegistry::mapLayer( QString theLayerId )`
`66`	`66`	`QgsMapLayer *`
`67`	`67`	`QgsMapLayerRegistry::addMapLayer( QgsMapLayer * theMapLayer, bool theEmitSignal )`
`68`	`68`	`{`
`69`		`- if ( !theMapLayer->isValid() )`
	`69`	`+ if ( !theMapLayer \|\| !theMapLayer->isValid() )`
`70`	`70`	`{`
`71`	`71`	`QgsDebugMsg( "cannot add invalid layers" );`
`72`	`72`	`return 0;`