From 6f5188b4c62102108ece3cd55013113cf47c5b4d Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Mon, 20 Nov 2023 18:06:20 +0800 Subject: [PATCH] fix: check and disallow folder insider folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 检查并禁止文件夹嵌套。 Log: --- src/models/multipageproxymodel.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/models/multipageproxymodel.cpp b/src/models/multipageproxymodel.cpp index f2b05ee1..7d075a5f 100644 --- a/src/models/multipageproxymodel.cpp +++ b/src/models/multipageproxymodel.cpp @@ -46,6 +46,7 @@ void MultipageProxyModel::commitDndOperation(const QString &dragId, const QStrin folder->moveItem(dragOrigPage, std::get<2>(dragOrigPos), dropOrigPage, std::get<2>(dropOrigPos)); } else { if (dragId.startsWith("internal/folders/")) return; // cannot drag folder onto something + if (std::get<0>(dropOrigPos) != 0) return; // folder inside folder is not allowed if (dropId.startsWith("internal/folders/")) { // drop into existing folder m_topLevel->removeItem(dragId);