Merge pull request #1057 from elpaso/master

jef-n · jef-n · commit 821518337188 · 2014-01-07T05:54:04.000-08:00
Fix #9306
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
@@ -2174,7 +2174,7 @@ void QgsWMSServer::applyOpacities( const QStringList& layerList, QList< QPair< Q
   QList< QPair< QgsMapLayer*, int > > layerOpacityList;
   QStringList::const_iterator oIt = opacityList.constBegin();
   QStringList::const_iterator lIt = layerList.constBegin();
-  for ( ; oIt != opacityList.constEnd(); ++oIt, ++lIt )
+  for ( ; oIt != opacityList.constEnd() && lIt != layerList.constEnd(); ++oIt, ++lIt )
   {
     //get layer list for
     int opacity = oIt->toInt();

Original file line number	Diff line number	Diff line change
`@@ -2174,7 +2174,7 @@ void QgsWMSServer::applyOpacities( const QStringList& layerList, QList< QPair< Q`
`2174`	`2174`	`QList< QPair< QgsMapLayer*, int > > layerOpacityList;`
`2175`	`2175`	`QStringList::const_iterator oIt = opacityList.constBegin();`
`2176`	`2176`	`QStringList::const_iterator lIt = layerList.constBegin();`
`2177`		`- for ( ; oIt != opacityList.constEnd(); ++oIt, ++lIt )`
	`2177`	`+ for ( ; oIt != opacityList.constEnd() && lIt != layerList.constEnd(); ++oIt, ++lIt )`
`2178`	`2178`	`{`
`2179`	`2179`	`//get layer list for`
`2180`	`2180`	`int opacity = oIt->toInt();`