fix #3245

jef · jef · commit 934eac0ca3a2 · 2010-12-07T19:33:15.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14860 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -1678,7 +1678,7 @@ void QgsWmsProvider::parseLayer( QDomElement const & e, QgsWmsLayerProperty& lay
     mLayerParents[ layerProperty.orderId ] = parentProperty->orderId;
   }
 
-  if ( layerProperty.layer.empty() )
+  if ( !layerProperty.name.isEmpty() )
   {
     // We have all the information we need to properly evaluate a layer definition
     // TODO: Save this somewhere
@@ -1721,7 +1721,8 @@ void QgsWmsProvider::parseLayer( QDomElement const & e, QgsWmsLayerProperty& lay
       layerProperty.style.clear();
     }
   }
-  else
+
+  if ( !layerProperty.layer.empty() )
   {
     mLayerParentNames[ layerProperty.orderId ] = QStringList() << layerProperty.name << layerProperty.title << layerProperty.abstract;
   }

Original file line number	Diff line number	Diff line change
`@@ -1678,7 +1678,7 @@ void QgsWmsProvider::parseLayer( QDomElement const & e, QgsWmsLayerProperty& lay`
`1678`	`1678`	`mLayerParents[ layerProperty.orderId ] = parentProperty->orderId;`
`1679`	`1679`	`}`
`1680`	`1680`
`1681`		`- if ( layerProperty.layer.empty() )`
	`1681`	`+ if ( !layerProperty.name.isEmpty() )`
`1682`	`1682`	`{`
`1683`	`1683`	`// We have all the information we need to properly evaluate a layer definition`
`1684`	`1684`	`// TODO: Save this somewhere`
`@@ -1721,7 +1721,8 @@ void QgsWmsProvider::parseLayer( QDomElement const & e, QgsWmsLayerProperty& lay`
`1721`	`1721`	`layerProperty.style.clear();`
`1722`	`1722`	`}`
`1723`	`1723`	`}`
`1724`		`- else`
	`1724`	`+`
	`1725`	`+ if ( !layerProperty.layer.empty() )`
`1725`	`1726`	`{`
`1726`	`1727`	`mLayerParentNames[ layerProperty.orderId ] = QStringList() << layerProperty.name << layerProperty.title << layerProperty.abstract;`
`1727`	`1728`	`}`