Pass entryFlags to clone() when recursing into sub-groups.

Based on keepassx/keepassx#178 by Mois Moshev <mois@monomon.me> Closes keepassxreboot#525
ovarn · Sep 2, 2016 · 1635a52 · 1635a52
1 parent 595b101
commit 1635a52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/core/Group.cpp b/src/core/Group.cpp
@@ -504,7 +504,7 @@ Group* Group::clone(Entry::CloneFlags entryFlags) const
     }
 
     Q_FOREACH (Group* groupChild, children()) {
-        Group* clonedGroupChild = groupChild->clone();
+        Group* clonedGroupChild = groupChild->clone(entryFlags);
         clonedGroupChild->setParent(clonedGroup);
     }
 

diff --git a/tests/TestGroup.cpp b/tests/TestGroup.cpp
@@ -386,7 +386,12 @@ void TestGroup::testClone()
     QVERIFY(clonedSubGroupEntry->uuid() != subGroupEntry->uuid());
     QCOMPARE(clonedSubGroupEntry->title(), QString("SubGroupEntry"));
 
+    Group* clonedGroupKeepUuid = originalGroup->clone(Entry::CloneNoFlags);
+    QCOMPARE(clonedGroupKeepUuid->entries().at(0)->uuid(), originalGroupEntry->uuid());
+    QCOMPARE(clonedGroupKeepUuid->children().at(0)->entries().at(0)->uuid(), subGroupEntry->uuid());
+
     delete clonedGroup;
+    delete clonedGroupKeepUuid;
     delete db;
 }