From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Mon, 23 Jan 2023 20:36:48 +0000 (+0100)
Subject: Make encrypted folder paths to delete non-relative when checking if they are encrypted
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~30^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=95aa3ee53b8ccfd6de1aa783a80c8c6c0a546f26;p=nextcloud-desktop.git

Make encrypted folder paths to delete non-relative when checking if they are encrypted

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 62156a7f0..05f61d6b8 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1341,7 +1341,7 @@ void Folder::removeLocalE2eFiles()
     const auto couldGetFiles = _journal.getFilesBelowPath("", [this, &e2eFoldersToBlacklist, &folderRootDir](const SyncJournalFileRecord &rec) {
         // We only want to add the root-most encrypted folder to the blacklist
         if (rec.isValid() && rec._isE2eEncrypted && rec.isDirectory()) {
-            QDir pathDir(rec._path);
+            QDir pathDir(_canonicalLocalPath + rec.path());
             bool parentPathEncrypted = false;
 
             while (pathDir.cdUp() && pathDir != folderRootDir) {