Fixed #3681

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15620 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 27, 2011 · 231a5d20acbb6702495f7889a6ee68230d718fae · 231a5d2
1 parent 2a656f1
commit 231a5d20acbb6702495f7889a6ee68230d718fae
Unified Split

Showing with 4 additions and 1 deletion.

+2 −0 src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp

+2 −1 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -138,6 +138,8 @@ QgsSymbolV2* QgsCategorizedSymbolRendererV2::symbolForFeature( QgsFeature& featu
 
   // find the right symbol for the category
   QgsSymbolV2* symbol = symbolForValue( *ita );
+  if ( symbol == NULL )
+    return NULL;
 
   if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )
     return symbol; // no data-defined rotation/scaling - just return the symbol

diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -137,7 +137,8 @@ QgsSymbolV2* QgsGraduatedSymbolRendererV2::symbolForFeature( QgsFeature& feature
 
   // find the right category
   QgsSymbolV2* symbol = symbolForValue( ita->toDouble() );
-
+  if ( symbol == NULL )
+    return NULL;
 
   if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )
     return symbol; // no data-defined rotation/scaling - just return the symbol