From cf7086c295fa15b459b8393cc8b4777e5b63acd8 Mon Sep 17 00:00:00 2001
From: Harpreet Sangar <happy_san@protonmail.com>
Date: Fri, 28 Apr 2023 13:35:07 +0530
Subject: [PATCH] Refactor `or_iterator_t::take_id`.

---
 src/or_iterator.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/or_iterator.cpp b/src/or_iterator.cpp
index 8dd9d487..6384cba2 100644
--- a/src/or_iterator.cpp
+++ b/src/or_iterator.cpp
@@ -209,7 +209,16 @@ bool or_iterator_t::take_id(result_iter_state_t& istate, uint32_t id, bool& is_e
     }
 
     if (istate.fit != nullptr && istate.fit->approx_filter_ids_length > 0) {
-        return (istate.fit->valid(id) == 1);
+        if (istate.fit->valid(id) == -1) {
+            return false;
+        }
+
+        if (istate.fit->seq_id == id) {
+            istate.fit->next();
+            return true;
+        }
+
+        return false;
     }
 
     return true;
@@ -245,5 +254,3 @@ or_iterator_t::~or_iterator_t() noexcept {
         it.reset_cache();
     }
 }
-
-