Skip to content
Permalink
Browse files

[symbology] Fix potential crash with data defined symbols

  • Loading branch information
nyalldawson committed May 9, 2015
1 parent 46b9029 commit 65cd9fcd7833f4e366375f7cea78f188226d2f58
Showing with 3 additions and 1 deletion.
  1. +3 −1 src/core/symbology-ng/qgssymbollayerv2.cpp
@@ -117,7 +117,9 @@ QVariant QgsSymbolLayerV2::evaluateDataDefinedProperty( const QString &property,
return QVariant();

if ( dd->useExpression() )
return dd->expression()->evaluate( feature );
{
return dd->expression() ? dd->expression()->evaluate( feature ) : QVariant();
}
else if ( feature && !dd->field().isEmpty() && !mFields.isEmpty() )
{
int attributeIndex = mFields.fieldNameIndex( dd->field() );

0 comments on commit 65cd9fc

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