Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-11-21 07:20:28 -05:00
Code Issues Projects Releases Packages Wiki Activity

Backporting #1008

Browse source
This commit is contained in:
Louis-Bertrand Varin 2017-10-07 10:30:39 -04:00 • committed by Jonathan White
parent 157f1134bf
commit 2e81751131
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/Database.cpp
View file

@ -328,6 +328,15 @@ void Database::emptyRecycleBin()
void Database::merge(const Database* other) void Database::merge(const Database* other)
{ {
m_rootGroup->merge(other->rootGroup()); m_rootGroup->merge(other->rootGroup());
for (Uuid customIconId : other->metadata()->customIcons().keys()) {
QImage customIcon = other->metadata()->customIcon(customIconId);
if (!this->metadata()->containsCustomIcon(customIconId)) {
qDebug("Adding custom icon %s to database.", qPrintable(customIconId.toHex()));
this->metadata()->addCustomIcon(customIconId, customIcon);
}
}
emit modified(); emit modified();
} }