Get folder moves to work, and fix the mime message moving.

1 files changed, 2 insertions, 1 deletions

diff --git a/common/synchronizer.cpp b/common/synchronizer.cpp
index b127ec5..46712b5 100644
--- a/common/synchronizer.cpp
+++ b/common/synchronizer.cpp
@@ -139,6 +139,7 @@ void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray
     const auto sinkId = syncStore().resolveRemoteId(bufferType, remoteId);
     const auto found = mainDatabase.contains(sinkId);
     auto adaptorFactory = Sink::AdaptorFactoryRegistry::instance().getFactory(mResourceType, bufferType);
+    Q_ASSERT(adaptorFactory);
     if (!found) {
         Trace() << "Found a new entity: " << remoteId;
         createEntity(
@@ -178,7 +179,7 @@ void Synchronizer::createOrModify(const QByteArray &bufferType, const QByteArray
             Sink::Query query;
             query.propertyFilter = mergeCriteria;
             bool merge = false;
-            Sink::EntityReader<DomainType> reader(mResourceInstanceIdentifier, mResourceType, transaction());
+            Sink::EntityReader<DomainType> reader(mResourceType, mResourceInstanceIdentifier, transaction());
             reader.query(query,
                 [this, bufferType, remoteId, &merge](const DomainType &o) -> bool{
                     merge = true;