Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-21 12:38:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fixes #940 : segfault when searching after merging

Browse source
This commit is contained in:
Louis-Bertrand Varin 2017-09-11 16:09:38 -04:00 • committed by TheZ3ro
parent d59ca0a9cc
commit faf36190bd
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/Group.cpp
View file

@ -904,7 +904,8 @@ void Group::resolveConflict(Entry* existingEntry, Entry* otherEntry)
if (timeExisting < timeOther) { if (timeExisting < timeOther) {
// only if other entry is newer, replace existing one // only if other entry is newer, replace existing one
removeEntry(existingEntry); removeEntry(existingEntry);
addEntry(otherEntry->clone(Entry::CloneNoFlags)); clonedEntry = otherEntry->clone(Entry::CloneNoFlags);
clonedEntry->setGroup(this);
} }
break; break;