From 19ab72c937a5efaa89de7220aaa91800dbc4e6ae Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Fri, 5 Aug 2016 08:16:46 +1000
Subject: [PATCH] Follow up 1f02fd

---
 src/providers/ogr/qgsogrfeatureiterator.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
index 74ec5001268..ebf29de7425 100644
--- a/src/providers/ogr/qgsogrfeatureiterator.cpp
+++ b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -199,20 +199,16 @@ bool QgsOgrFeatureIterator::fetchFeature( QgsFeature& feature )
   }
   else if ( mRequest.filterType() == QgsFeatureRequest::FilterFids )
   {
-    if ( mFilterFidsIt == mFilterFids.constEnd() )
-    {
-      close();
-      return false;
-    }
-    else
+    while ( mFilterFidsIt != mFilterFids.constEnd() )
     {
       QgsFeatureId nextId = *mFilterFidsIt;
       mFilterFidsIt++;
-      bool result = fetchFeatureWithId( nextId, feature );
-      if ( !result )
-        close();
-      return result;
+
+      if ( fetchFeatureWithId( nextId, feature ) )
+        return true;
     }
+    close();
+    return false;
   }
 
   OGRFeatureH fet;