From 4a3bd72db8e10e77e8b52769bbfd511bccd5bafb Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Fri, 23 Oct 2020 17:45:47 +0300 Subject: [PATCH] QmlDesigner: Fix duplicate locked item entries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix: When selecting more than 1 ancestor of a locked item and pressing Delete, the locked item will appear duplicate in the warning message box as many times as the number of selected ancestors. Change-Id: I72c5e35edb2974da3d630a87e236b58e0d7e8ab3 Reviewed-by: Miikka Heikkinen Reviewed-by: Henning Gründl Reviewed-by: Thomas Hartmann --- .../qmldesigner/components/integration/designdocument.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index ea471f530da..2b567a8e690 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -380,7 +380,7 @@ void DesignDocument::deleteSelected() QStringList lockedNodes; for (const ModelNode &modelNode : view()->selectedModelNodes()) { for (const ModelNode &node : modelNode.allSubModelNodesAndThisNode()) { - if (node.isValid() && !node.isRootNode() && node.locked()) + if (node.isValid() && !node.isRootNode() && node.locked() && !lockedNodes.contains(node.id())) lockedNodes.push_back(node.id()); } }