Merge pull request #5638 from pblottiere/bugfix_joins

[bugfix] Fixes #17450 by correctly setting the join info ordered list
qgis · Nov 22, 2017 · 5945a84 · 5945a84
2 parents b058df7 + 333a8e9
commit 5945a84
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -722,12 +722,11 @@ void QgsVectorLayerFeatureIterator::createOrderedJoinList()
       int joinField = mOrderedJoinInfoList.at( i ).joinField;
 
       QgsAttributeList attributes = mOrderedJoinInfoList.at( i ).attributes;
-      QgsAttributeList::const_iterator attIt = attributes.constBegin();
+      for ( int n = 0; n < attributes.size(); n++ )
-      for ( ; attIt != attributes.constEnd(); ++attIt )
       {
-        if ( *attIt != joinField )
+        if ( n != joinField )
         {
-          resolvedFields.insert( joinField < *attIt ? *attIt + offset - 1 : *attIt + offset );
+          resolvedFields.insert( joinField < n ? n + offset - 1 : n + offset );
         }
       }
     }