add only valid layers, fixes #812

git-svn-id: http://svn.osgeo.org/qgis/trunk@7624 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 20, 2007 · 4dbc0bc · 4dbc0bc
1 parent 1213e34
commit 4dbc0bc
Showing 1 changed file with 6 additions and 1 deletion.
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