From 2144ed85258e0e9d02d08cc4e5898dd34e776df6 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Mon, 12 Oct 2015 11:18:12 +0200
Subject: Ignore removed entities while loading the initial result set.

---
 common/entitystorage.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'common')

diff --git a/common/entitystorage.cpp b/common/entitystorage.cpp
index b19fe0a..e5346f4 100644
--- a/common/entitystorage.cpp
+++ b/common/entitystorage.cpp
@@ -97,7 +97,10 @@ ResultSet EntityStorageBase::filteredSet(const ResultSet &resultSet, const std::
             readEntity(transaction, resultSetPtr->id(), [this, filter, callback, initialQuery](const Akonadi2::ApplicationDomain::ApplicationDomainType::Ptr &domainObject, Akonadi2::Operation operation) {
                 if (filter(domainObject)) {
                     if (initialQuery) {
-                        callback(domainObject, Akonadi2::Operation_Creation);
+                        //We're not interested in removals during the initial query
+                        if (operation != Akonadi2::Operation_Removal) {
+                            callback(domainObject, Akonadi2::Operation_Creation);
+                        }
                     } else {
                         callback(domainObject, operation);
                     }
-- 
cgit v1.2.3