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

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2010-06-24 15:53:20 +0000 (Thu, 24 Jun 2010)
New Revision: 13798

Modified:
   trunk/qgis/src/providers/wms/qgswmsprovider.cpp
Log:
Fix for problem with mix of toplevel layers and nested layers

Modified: trunk/qgis/src/providers/wms/qgswmsprovider.cpp
===================================================================
--- trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-06-24 13:46:23 UTC (rev 13797)
+++ trunk/qgis/src/providers/wms/qgswmsprovider.cpp	2010-06-24 15:53:20 UTC (rev 13798)
@@ -1716,6 +1716,11 @@
     mLayerParentNames[ layerProperty.orderId ] = QStringList() << layerProperty.name << layerProperty.title << layerProperty.abstract;
   }
 
+  if ( !parentProperty )
+  {
+    layerProperty.layer.clear();
+  }
+
 //  QgsDebugMsg("exiting.");
 }