Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/keepassxreboot/keepassxc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/Merger.cpp')
-rw-r--r--src/core/Merger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp
index e4cf0f994..c73248388 100644
--- a/src/core/Merger.cpp
+++ b/src/core/Merger.cpp
@@ -618,8 +618,8 @@ Merger::ChangeList Merger::mergeMetadata(const MergeContext& context)
const auto keys = sourceMetadata->customIcons().keys();
for (QUuid customIconId : keys) {
- QImage customIcon = sourceMetadata->customIcon(customIconId);
if (!targetMetadata->containsCustomIcon(customIconId)) {
+ QImage customIcon = sourceMetadata->customIcon(customIconId);
targetMetadata->addCustomIcon(customIconId, customIcon);
changes << tr("Adding missing icon %1").arg(QString::fromLatin1(customIconId.toRfc4122().toHex()));
}