[QGIS Commit] r14860 - trunk/qgis/src/providers/wms

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-12-07 11:33:15 -0800 (Tue, 07 Dec 2010)
New Revision: 14860

Modified:
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
fix #3245

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-12-07 19:05:21 UTC (rev 14859)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-12-07 19:33:15 UTC (rev 14860)
@@ -1678,7 +1678,7 @@
     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 @@
       layerProperty.style.clear();
     }
   }
-  else
+
+  if ( !layerProperty.layer.empty() )
   {
     mLayerParentNames[ layerProperty.orderId ] = QStringList() << layerProperty.name << layerProperty.title << layerProperty.abstract;
   }