From faf36190bd889037a60bd3f67d9c47a217d4fae1 Mon Sep 17 00:00:00 2001
From: Louis-Bertrand Varin <louisbvarin@gmail.com>
Date: Mon, 11 Sep 2017 16:09:38 -0400
Subject: [PATCH] Fixes #940 : segfault when searching after merging

---
 src/core/Group.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/core/Group.cpp b/src/core/Group.cpp
index edbed947..94f14f20 100644
--- a/src/core/Group.cpp
+++ b/src/core/Group.cpp
@@ -904,7 +904,8 @@ void Group::resolveConflict(Entry* existingEntry, Entry* otherEntry)
             if (timeExisting < timeOther) {
                 // only if other entry is newer, replace existing one
                 removeEntry(existingEntry);
-                addEntry(otherEntry->clone(Entry::CloneNoFlags));
+                clonedEntry = otherEntry->clone(Entry::CloneNoFlags);
+                clonedEntry->setGroup(this);
             }
 
             break;