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.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/Merger.cpp b/src/core/Merger.cpp
index a5f532af2..b7c832951 100644
--- a/src/core/Merger.cpp
+++ b/src/core/Merger.cpp
@@ -611,8 +611,7 @@ Merger::ChangeList Merger::mergeMetadata(const MergeContext& context)
for (const auto& iconUuid : sourceMetadata->customIconsOrder()) {
if (!targetMetadata->hasCustomIcon(iconUuid)) {
- QImage customIcon = sourceMetadata->customIcon(iconUuid);
- targetMetadata->addCustomIcon(iconUuid, customIcon);
+ targetMetadata->addCustomIcon(iconUuid, sourceMetadata->customIcon(iconUuid));
changes << tr("Adding missing icon %1").arg(QString::fromLatin1(iconUuid.toRfc4122().toHex()));
}
}