Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[labels] Fix null data defined value was not ignored in some cases
Cherry-picked from eb6279a
  • Loading branch information
nyalldawson committed Jul 9, 2015
1 parent 30dd60e commit 6075254
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/core/qgspallabeling.cpp
Expand Up @@ -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 );
Expand Down

0 comments on commit 6075254

Please sign in to comment.