change handling

qgis · Dec 8, 2021 · c30d996 · c30d996
1 parent 75f1b37
commit c30d996
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -5477,13 +5477,13 @@ static QVariant fcnGetFeature( const QVariantList &values, const QgsExpressionCo
   }
   QgsFeatureRequest req;
   QString cacheValueKey;
-  if ( values.size() == 2 && values.at( 1 ).canConvert<QVariantMap>() )
+  if ( values.size() == 2 && values.at( 1 ).type() == QVariant::Map  )
   {
-    QVariantMap map = values.at( 1 ).toMap();
+    QVariantMap attributeMap = QgsExpressionUtils::getMapValue( values.at( 1 ), parent );
 
-    QMap <QString, QVariant>::const_iterator i = map.constBegin();
+    QMap <QString, QVariant>::const_iterator i = attributeMap.constBegin();
     QString filterString;
-    for ( ; i != map.constEnd(); ++i )
+    for ( ; i != attributeMap.constEnd(); ++i )
     {
       if ( !filterString.isEmpty() )
       {