Backporting keepassxreboot#1008

stryku · Oct 7, 2017 · 2e81751 · 2e81751
1 parent 157f113
commit 2e81751
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/core/Database.cpp b/src/core/Database.cpp
@@ -328,6 +328,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();
 }