setExpressionString deactivates QgsProperty if expression string is e…

…mpty
qgis · Feb 3, 2022 · 7cdf03e · 7cdf03e
1 parent 0a0da90
commit 7cdf03e
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/core/qgsproperty.cpp b/src/core/qgsproperty.cpp
@@ -370,13 +370,20 @@ QgsProperty::operator bool() const
 void QgsProperty::setExpressionString( const QString &expression )
 {
   d.detach();
-  d->type = ExpressionBasedProperty;
   d->expressionString = expression;
-  d->expression = QgsExpression( expression );
+  d->expression = QgsExpression(expression);
   d->expressionPrepared = false;
   d->expressionIsInvalid = false;
+
   if ( d->expressionString.isEmpty() )
+  {
     d->active = false;
+    d->type = InvalidProperty;
+  }
+  else
+  {
+    d->type = ExpressionBasedProperty;
+  }  
 }
 
 QString QgsProperty::expressionString() const