From d99d2fd97ce026a9db0145e37de87182c8eed501 Mon Sep 17 00:00:00 2001
From: "Juergen E. Fischer" <jef@norbit.de>
Date: Fri, 31 Oct 2014 10:05:17 +0100
Subject: [PATCH] fix graduated renderer crash (followup 6de53e51b)

---
 src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
index 58c695d37898..0a19014a1f62 100644
--- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
+++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -966,7 +966,7 @@ QList<double> QgsGraduatedSymbolRendererV2::getDataValues( QgsVectorLayer *vlaye
     lst = expression->referencedColumns();
 
   QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest()
-                                                .setFlags( expression->needsGeometry() ?
+                                                .setFlags( ( !expression.isNull() && expression->needsGeometry() ) ?
                                                              QgsFeatureRequest::NoFlags :
                                                              QgsFeatureRequest::NoGeometry  )
                                                 .setSubsetOfAttributes( lst, vlayer->pendingFields() ) );