In case of a null variant, the default value is returned (otherwise m…

…oved labels/diagrams are not displayed on opening when show/hide DD are NULL)
qgis · Oct 9, 2017 · c4dd1d4 · c4dd1d4
1 parent 283d796
commit c4dd1d4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/core/qgsproperty.cpp b/src/core/qgsproperty.cpp
@@ -624,7 +624,7 @@ bool QgsProperty::valueAsBool( const QgsExpressionContext &context, bool default
   bool valOk = false;
   QVariant val = value( context, defaultValue, &valOk );
 
-  if ( !valOk || !val.isValid() )
+  if ( !valOk || !val.isValid() || val.isNull() )
     return defaultValue;
 
   if ( ok )