Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add safety check so we don't insert empty icons.

Browse Source
This commit is contained in:
Felix Geyer 2013-04-07 19:37:44 +02:00
parent 5a96e19ce9
commit fe42861bed
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Metadata.cpp
View File

@ -353,7 +353,7 @@ void Metadata::copyCustomIcons(const QSet<Uuid>& iconList, const Metadata* other
Q_FOREACH (const Uuid& uuid, iconList) { Q_FOREACH (const Uuid& uuid, iconList) {
Q_ASSERT(otherMetadata->containsCustomIcon(uuid)); Q_ASSERT(otherMetadata->containsCustomIcon(uuid));
if (!containsCustomIcon(uuid)) { if (!containsCustomIcon(uuid) && otherMetadata->containsCustomIcon(uuid)) {
addCustomIcon(uuid, otherMetadata->customIcon(uuid)); addCustomIcon(uuid, otherMetadata->customIcon(uuid));
} }
} }