add only valid layers, fixes #812

jef · jef · commit 4dbc0bc5c725 · 2007-11-20T16:32:13.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@7624 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/qgsmaplayerregistry.cpp b/src/core/qgsmaplayerregistry.cpp
@@ -77,6 +77,11 @@ QgsMapLayer *
   QgsMapLayerRegistry::addMapLayer( QgsMapLayer * theMapLayer, bool theEmitSignal )
 {
   QgsDebugMsg("QgsMapLayerRegistry::addMaplayer - '" + theMapLayer->name());
+  if( !theMapLayer->isValid() ) {
+    QgsDebugMsg("cannot add invalid layers");
+    return 0;
+  }
+
   //check the layer is not already registered!
   std::map<QString,QgsMapLayer*>::iterator myIterator = mMapLayers.find(theMapLayer->getLayerID());
   //if myIterator returns mMapLayers.end() then it does not exist in registry and its safe to add it
@@ -92,7 +97,7 @@ QgsMapLayer *
   else
   {
     QgsDebugMsg("addMaplayer - " + theMapLayer->name() + " already registered");
-    return 0x0;
+    return 0;
   }
 } //  QgsMapLayerRegistry::addMapLayer
 

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,11 @@ QgsMapLayer *`
`77`	`77`	`QgsMapLayerRegistry::addMapLayer( QgsMapLayer * theMapLayer, bool theEmitSignal )`
`78`	`78`	`{`
`79`	`79`	`QgsDebugMsg("QgsMapLayerRegistry::addMaplayer - '" + theMapLayer->name());`
	`80`	`+ if( !theMapLayer->isValid() ) {`
	`81`	`+ QgsDebugMsg("cannot add invalid layers");`
	`82`	`+ return 0;`
	`83`	`+ }`
	`84`	`+`
`80`	`85`	`//check the layer is not already registered!`
`81`	`86`	`std::map<QString,QgsMapLayer*>::iterator myIterator = mMapLayers.find(theMapLayer->getLayerID());`
`82`	`87`	`//if myIterator returns mMapLayers.end() then it does not exist in registry and its safe to add it`
`@@ -92,7 +97,7 @@ QgsMapLayer *`
`92`	`97`	`else`
`93`	`98`	`{`
`94`	`99`	`QgsDebugMsg("addMaplayer - " + theMapLayer->name() + " already registered");`
`95`		`- return 0x0;`
	`100`	`+ return 0;`
`96`	`101`	`}`
`97`	`102`	`} // QgsMapLayerRegistry::addMapLayer`
`98`	`103`