mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-05 21:47:38 +03:00
Code Issues Projects Releases Packages Wiki Activity

Add custom icons when merging. (#1008)

Browse source 
* Adding missing custom icons on merge.
* qDebug when adding icon
* Adding test for merge custom icons.
This commit is contained in:
louib 2017-10-07 10:40:29 -04:00 • committed by GitHub
parent 0d5fec6dfc
commit 242faa138b
7 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/core/Database.cpp
View file

@ -331,6 +331,15 @@ void Database::emptyRecycleBin()
void Database::merge(const Database* other)
{
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();
}