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

Merge branch 'release/2.4.0' into develop

Browse source
This commit is contained in:
Jonathan White 2019-02-15 09:01:09 -05:00
commit fa459b0d1e
No known key found for this signature in database
GPG key ID: 440FC65F2E0C6E01
297 changed files with 129410 additions and 151299 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/format/KdbxXmlReader.cpp
View file

@ -367,6 +367,10 @@ void KdbxXmlReader::parseIcon()
}
if (uuidSet && iconSet) {
// Check for duplicate UUID (corruption)
if (m_meta->containsCustomIcon(uuid)) {
uuid = QUuid::createUuid();
}
m_meta->addCustomIcon(uuid, icon);
return;
}