Fix #12167 - Handle nulls in show label property for labels

Funded by Digital Mapping Solutions
qgis · Feb 11, 2015 · a15aa74 · a15aa74
1 parent edc1d5e
commit a15aa74
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1449,10 +1449,12 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
   dataDefinedValues.clear();
 
   // data defined show label? defaults to show label if not 0
-  if ( dataDefinedEvaluate( QgsPalLayerSettings::Show, exprVal ) )
+  if ( dataDefinedIsActive( QgsPalLayerSettings::Show ) )
   {
-    QgsDebugMsgLevel( QString( "exprVal Show:%1" ).arg( exprVal.toBool() ? "true" : "false" ), 4 );
-    if ( !exprVal.toBool() )
+    bool showLabel = dataDefinedEvaluate( QgsPalLayerSettings::Show, exprVal );
+    showLabel = exprVal.toBool();
+    QgsDebugMsgLevel( QString( "exprVal Show:%1" ).arg( showLabel ? "true" : "false" ), 4 );
+    if ( !showLabel )
     {
       return;
     }