Package: qgis / 2.4.0-1

0001-Fix-10720.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
From e973c66aa09baa9c8147ef231b11c9d8eefa680c Mon Sep 17 00:00:00 2001
From: Marco Hugentobler <marco.hugentobler@sourcepole.ch>
Date: Thu, 10 Jul 2014 17:25:08 +0200
Subject: Fix #10720
Origin: https://github.com/qgis/QGIS/commit/e973c66aa09baa9c8147ef231b11c9d8eefa680c
Bug: http://hub.qgis.org/issues/10720


--- a/src/mapserver/qgswmsprojectparser.cpp
+++ b/src/mapserver/qgswmsprojectparser.cpp
@@ -168,8 +168,7 @@ QList<QgsMapLayer*> QgsWMSProjectParser:
         QHash< QString, QDomElement >::const_iterator pLayerNameIt = pLayerByName.find( lName );
         if ( pLayerNameIt != pLayerByName.constEnd() )
         {
-          pp.layerFromLegendLayer( pLayerNameIt.value(), layers, useCache );
-          break;
+          return ( QList<QgsMapLayer*>() << pp.createLayerFromElement( pLayerNameIt.value(), useCache ) );
         }
 
         const QList<QDomElement>& legendGroupElements = pp.legendGroupElements();