Only use the parent index when it's available

1 files changed, 8 insertions, 6 deletions

diff --git a/common/facade.cpp b/common/facade.cpp
index 850d28b..68770b5 100644
--- a/common/facade.cpp
+++ b/common/facade.cpp
@@ -350,12 +350,14 @@ template<class DomainType>
 qint64 GenericFacade<DomainType>::executeInitialQuery(const Akonadi2::Query &query, const typename DomainType::Ptr &parent, Akonadi2::ResultProviderInterface<typename DomainType::Ptr> &resultProvider)
 {
     auto modifiedQuery = query;
-    if (parent && !query.parentProperty.isEmpty()) {
-        Trace() << "Running initial query for parent:" << parent->identifier();
-        modifiedQuery.propertyFilter.insert(query.parentProperty, parent->identifier());
-    } else {
-        Trace() << "Running initial query for toplevel";
-        modifiedQuery.propertyFilter.insert(query.parentProperty, QVariant());
+    if (!query.parentProperty.isEmpty()) {
+        if (parent) {
+            Trace() << "Running initial query for parent:" << parent->identifier();
+            modifiedQuery.propertyFilter.insert(query.parentProperty, parent->identifier());
+        } else {
+            Trace() << "Running initial query for toplevel";
+            modifiedQuery.propertyFilter.insert(query.parentProperty, QVariant());
+        }
     }
     return load(modifiedQuery, [&](Akonadi2::Storage::Transaction &transaction, QSet<QByteArray> &remainingFilters) -> ResultSet {
         return loadInitialResultSet(modifiedQuery, transaction, remainingFilters);