Skip to content

Commit 6075254

Browse files
committedJul 9, 2015
[labels] Fix null data defined value was not ignored in some cases
Cherry-picked from eb6279a
1 parent 30dd60e commit 6075254

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎src/core/qgspallabeling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,7 @@ bool QgsPalLayerSettings::dataDefinedEvaluate( DataDefinedProperties p, QVariant
12051205

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

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

0 commit comments

Comments
 (0)
Please sign in to comment.