From 0b198ba03bfbaad0a11a0cc057db72df3370d4a9 Mon Sep 17 00:00:00 2001
From: Marco Hugentobler <marco.hugentobler@sourcepole.ch>
Date: Fri, 2 Mar 2012 09:25:17 +0100
Subject: [PATCH] WMS featureinfo: use willRenderFeature instead of
 symbolForFeature

---
 src/mapserver/qgswmsserver.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
index 7d6f825a8156..b9ca981297a8 100644
--- a/src/mapserver/qgswmsserver.cpp
+++ b/src/mapserver/qgswmsserver.cpp
@@ -1257,7 +1257,16 @@ int QgsWMSServer::featureInfoFromVectorLayer( QgsVectorLayer* layer,
     if ( layer->isUsingRendererV2() )
     {
       QgsFeatureRendererV2* r2 = layer->rendererV2();
-      if ( !r2 || !r2->symbolForFeature( feature ) )
+      if ( !r2 )
+      {
+        continue;
+      }
+
+      QgsRenderContext c;
+      r2->startRender( c, layer );
+      bool renderV2 = r2->willRenderFeature( feature );
+      r2->stopRender( c );
+      if ( !renderV2 )
       {
         continue;
       }