Fix single parameter version of represent_value

Fix #17407
qgis · Nov 7, 2017 · 5595f40 · 5595f40
1 parent 07cef67
commit 5595f40
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -3435,15 +3435,13 @@ static QVariant fcnRepresentValue( const QVariantList &values, const QgsExpressi
 {
   QVariant result;
   QString fieldName;
-  if ( values.size() == 1 )
+  if ( !values.isEmpty() )
   {
     QgsExpressionNodeColumnRef *col = dynamic_cast<QgsExpressionNodeColumnRef *>( node->args()->at( 0 ) );
-    if ( col )
+    if ( col && ( values.size() == 1 || !values.at( 1 ).isValid() ) )
       fieldName = col->name();
-  }
-  else
-  {
-    fieldName = QgsExpressionUtils::getStringValue( values.at( 1 ), parent );
+    else if ( values.size() == 2 )
+      fieldName = QgsExpressionUtils::getStringValue( values.at( 1 ), parent );
   }
   QVariant value = values.at( 0 );