Fixes keepassxreboot#940 : segfault when searching after merging

sami-bgs · Sep 15, 2017 · faf3619 · faf3619
1 parent d59ca0a
commit faf3619
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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;