1 files changed, 12 insertions, 0 deletions

diff --git a/common/pipeline.cpp b/common/pipeline.cpp
index acccd90..01db980 100644
--- a/common/pipeline.cpp
+++ b/common/pipeline.cpp
@@ -159,7 +159,19 @@ KAsync::Job<qint64> Pipeline::newEntity(void const *command, size_t size)
     QByteArray key;
     if (createEntity->entityId()) {
         key = QByteArray(reinterpret_cast<char const*>(createEntity->entityId()->Data()), createEntity->entityId()->size());
+
+        bool found = false;
+        d->transaction.openDatabase(bufferType + ".main").scan(key, [&found](const QByteArray &, const QByteArray &value) -> bool {
+            found = true;
+            return false;
+        }, [this](const Akonadi2::Storage::Error &error) {
+        }, true);
+        if (found) {
+            ErrorMsg() << "An entity with this id already exists: " << key;
+            return KAsync::error<qint64>(0);
+        }
     }
+
     if (key.isEmpty()) {
         key = QUuid::createUuid().toString().toUtf8();
     }