Skip to content
Permalink
Browse files

[labels] Fix null data defined value was not ignored in some cases

Cherry-picked from eb6279a
  • Loading branch information
nyalldawson committed Jul 8, 2015
1 parent 30dd60e commit 60752549afcfa19fcf261a855b351d874f403d05
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/core/qgspallabeling.cpp
@@ -1205,7 +1205,7 @@ bool QgsPalLayerSettings::dataDefinedEvaluate( DataDefinedProperties p, QVariant

QVariant result = dataDefinedValue( p, *mCurFeat, *mCurFields );

if ( result.isValid() ) // filter NULL values? i.e. && !result.isNull()
if ( result.isValid() && !result.isNull() )
{
//QgsDebugMsgLevel( QString( "result type:" ) + QString( result.typeName() ), 4 );
//QgsDebugMsgLevel( QString( "result string:" ) + result.toString(), 4 );

0 comments on commit 6075254

Please sign in to comment.
You can’t perform that action at this time.